@atlaskit/editor-core 185.2.2 → 185.2.7

package/dist/esm/plugins/block-type/index.js

@@ -7,12 +7,12 @@ import inputRulePlugin from './pm-plugins/input-rule';
 import ToolbarBlockType from './ui/ToolbarBlockType';
 import WithPluginState from '../../ui/WithPluginState';
 import { setBlockTypeWithAnalytics } from './commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import * as keymaps from '../../keymaps';
 import { IconHeading, IconQuote } from '../quick-insert/assets';
 import { messages } from './messages';
 import { ToolbarSize } from '../../ui/Toolbar/types';
-var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
+var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
     return [];
@@ -40,7 +40,7 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
         var tr = insert(state.schema.nodes.heading.createChecked({
           level: level
         }));
-        return addAnalytics(state, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: ACTION.FORMATTED,
           actionSubject: ACTION_SUBJECT.TEXT,
           eventType: EVENT_TYPE.TRACK,
@@ -49,12 +49,13 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
             inputMethod: INPUT_METHOD.QUICK_INSERT,
             newHeadingLevel: level
           }
-        });
+        })(tr);
+        return tr;
       }
     };
   });
 };
-var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed) {
+var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref2.formatMessage;
   if (!isAllowed) {
     return [];
@@ -70,7 +71,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
     },
     action: function action(insert, state) {
       var tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
-      return addAnalytics(state, tr, {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
         eventType: EVENT_TYPE.TRACK,
@@ -78,11 +79,12 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
         attributes: {
           inputMethod: INPUT_METHOD.QUICK_INSERT
         }
-      });
+      })(tr);
+      return tr;
     }
   }];
 };
-var blockTypePlugin = function blockTypePlugin(options) {
+var blockTypePlugin = function blockTypePlugin(options, api) {
   return {
     name: 'blockType',
     nodes: function nodes() {
@@ -166,8 +168,9 @@ var blockTypePlugin = function blockTypePlugin(options) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
+        var _api$dependencies$ana, _api$dependencies$ana2;
         var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1)));
+        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions)));
       }
     }
   };

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -71,8 +71,8 @@ var CardInner = function CardInner(_ref) {
     }), smartCard);
   }
   var displayGrid = function displayGrid(visible, gridType, highlight) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2;
-    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.displayGrid(view)({
+    var _pluginInjectionApi$d;
+    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.grid.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.displayGrid(view)({
       visible: visible,
       gridType: gridType,
       highlight: highlight

package/dist/esm/plugins/card/nodeviews/genericCard.js

@@ -80,6 +80,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         // (2) Render a blue link whilst downgrading to `link` in the ADF (fatal errs).
 
         if (maybeAPIError.kind && maybeAPIError.kind === 'fatal') {
+          var _pluginInjectionApi$d;
           this.setState({
             isError: true
           });
@@ -93,7 +94,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           if (!getPos || typeof getPos === 'boolean') {
             return;
           }
-          changeSelectedCardToLinkFallback(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.analytics.actions)(view.state, view.dispatch);
+          changeSelectedCardToLinkFallback(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions)(view.state, view.dispatch);
           return null;
         } else {
           // Otherwise, render a blue link as fallback (above in render()).

package/dist/esm/plugins/card/toolbar.js

@@ -189,7 +189,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         linkPicker: linkPicker,
         node: node,
         featureFlags: featureFlags,
-        editorAnalyticsApi: editorAnalyticsApi
+        pluginInjectionApi: pluginInjectionApi
       })];
     } else {
       var inlineCard = state.schema.nodes.inlineCard;

package/dist/esm/plugins/card/ui/EditLinkToolbar.js

@@ -17,7 +17,6 @@ import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDT
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
-import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
 var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
@@ -34,7 +33,8 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
      * and not close the floating toolbar.
      */
     _defineProperty(_assertThisInitialized(_this), "handleEsc", function (e) {
-      forceFocusSelector("[aria-label=\"".concat(linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
+      var _this$props$forceFocu, _this$props;
+      (_this$props$forceFocu = (_this$props = _this.props).forceFocusSelector) === null || _this$props$forceFocu === void 0 ? void 0 : _this$props$forceFocu.call(_this$props, "[aria-label=\"".concat(linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
     });
     return _this;
   }
@@ -60,14 +60,14 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props = this.props,
-        linkPickerOptions = _this$props.linkPickerOptions,
-        providerFactory = _this$props.providerFactory,
-        url = _this$props.url,
-        text = _this$props.text,
-        view = _this$props.view,
-        featureFlags = _this$props.featureFlags,
-        _onSubmit = _this$props.onSubmit;
+      var _this$props2 = this.props,
+        linkPickerOptions = _this$props2.linkPickerOptions,
+        providerFactory = _this$props2.providerFactory,
+        url = _this$props2.url,
+        text = _this$props2.text,
+        view = _this$props2.view,
+        featureFlags = _this$props2.featureFlags,
+        _onSubmit = _this$props2.onSubmit;
       return /*#__PURE__*/React.createElement(HyperLinkToolbarWithListeners, {
         view: view,
         linkPickerOptions: linkPickerOptions,
@@ -112,12 +112,13 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
     node = _ref.node,
     linkPicker = _ref.linkPicker,
     featureFlags = _ref.featureFlags,
-    editorAnalyticsApi = _ref.editorAnalyticsApi;
+    pluginInjectionApi = _ref.pluginInjectionApi;
   return {
     type: 'custom',
     disableArrowNavigation: true,
     fallback: [],
     render: function render(view, idx) {
+      var _pluginInjectionApi$d;
       if (!view || !providerFactory) {
         return null;
       }
@@ -131,6 +132,7 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
         text: displayInfo.title || '',
         node: node,
         featureFlags: featureFlags,
+        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector,
         onSubmit: function onSubmit(newHref, newText, analytic) {
           var urlChanged = newHref !== displayInfo.url;
           var titleChanged = newText !== displayInfo.title;
@@ -138,7 +140,8 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
           // If the title is changed in a smartlink, convert to standard blue hyperlink
           // (even if the url was also changed) - we don't want to lose the custom title.
           if (titleChanged) {
-            return commandWithMetadata(changeSelectedCardToLink(newText, newHref, undefined, undefined, undefined, editorAnalyticsApi), {
+            var _pluginInjectionApi$d2;
+            return commandWithMetadata(changeSelectedCardToLink(newText, newHref, undefined, undefined, undefined, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions), {
               action: ACTION.UPDATED,
               sourceEvent: analytic
             })(view.state, view.dispatch);

package/dist/esm/plugins/floating-toolbar/index.js

@@ -22,7 +22,7 @@ import { ToolbarLoader } from './ui/ToolbarLoader';
 import { findNode } from './utils';
 import { ErrorBoundary } from '../../ui/ErrorBoundary';
 import { processCopyButtonItems } from '../copy-button/toolbar';
-import forceFocusPlugin from './pm-plugins/force-focus';
+import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 export var getRelevantConfig = function getRelevantConfig(selection, configs) {
   // node selections always take precedence, see if
   var configPair;
@@ -146,6 +146,9 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
         }
       }];
     },
+    actions: {
+      forceFocusSelector: forceFocusSelector
+    },
     contentComponent: function contentComponent(_ref3) {
       var popupsMountPoint = _ref3.popupsMountPoint,
         popupsBoundariesElement = _ref3.popupsBoundariesElement,

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

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import uuidV4 from 'uuid/v4';
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
 import { getMediaClient, isMediaBlobUrl as _isMediaBlobUrl, getAttrsFromUrl, isImageRepresentationReady } from '@atlaskit/media-client';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { replaceExternalMedia, updateAllMediaSingleNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaSingleNodeAttrs } from '../commands/helpers';
 export var MediaNodeUpdater = /*#__PURE__*/function () {
   function MediaNodeUpdater(props) {

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

@@ -338,7 +338,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     }
   };
   if (allowLinking && mediaLinkingState && mediaLinkingState.visible && shouldShowMediaLinkToolbar(state)) {
-    var linkingToolbar = getLinkingToolbar(baseToolbar, mediaLinkingState, state, intl, providerFactory);
+    var linkingToolbar = getLinkingToolbar(baseToolbar, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory);
     if (linkingToolbar) {
       return linkingToolbar;
     }

package/dist/esm/plugins/media/toolbar/linking.js

@@ -6,7 +6,6 @@ import { hideLinkingToolbar, setUrlToMedia, unlink } from '../commands/linking';
 import { getMediaLinkingState } from '../pm-plugins/linking';
 import MediaLinkingToolbar from '../ui/MediaLinkingToolbar';
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
-import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
 var FORCE_FOCUS_SELECTOR = '[data-testid="add-link-button"],[data-testid="edit-link-button"]';
 export function shouldShowMediaLinkToolbar(editorState) {
   var mediaLinkingState = getMediaLinkingState(editorState);
@@ -24,7 +23,7 @@ export function shouldShowMediaLinkToolbar(editorState) {
     parent = _editorState$doc$reso.parent;
   return parent && parent.type.allowsMarkType(link);
 }
-export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, mediaLinkingState, state, intl, providerFactory) {
+export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory) {
   var link = mediaLinkingState.link,
     visible = mediaLinkingState.visible,
     editing = mediaLinkingState.editable,
@@ -60,11 +59,12 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
                 hideLinkingToolbar(view.state, view.dispatch, view);
               },
               onCancel: function onCancel() {
+                var _pluginInjectionApi$d;
                 hideLinkingToolbar(view.state, view.dispatch, view, true);
                 /** Focus should move to the 'Add link' button when the toolbar closes
                  * and not close the floating toolbar.
                  */
-                forceFocusSelector(FORCE_FOCUS_SELECTOR, view);
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR, view);
               },
               onSubmit: function onSubmit(href, meta) {
                 setUrlToMedia(href, meta.inputMethod)(view.state, view.dispatch, view);

package/dist/esm/version-wrapper.js

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

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

@@ -118,6 +118,9 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
     dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -138,6 +141,9 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>, (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
     pluginConfiguration: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"submitEditor", {

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

@@ -147,6 +147,9 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
     dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -167,6 +170,9 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>, (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
     pluginConfiguration: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"submitEditor", {
@@ -376,6 +382,9 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
     dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -396,6 +405,9 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>, (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
     pluginConfiguration: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"submitEditor", {

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

@@ -121,6 +121,9 @@ export declare function useMobilePreset({ media, placeholder, maxContentSize, cr
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
     dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -141,6 +144,9 @@ export declare function useMobilePreset({ media, placeholder, maxContentSize, cr
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
     }>];
+    actions: {
+        forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+    };
 }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>, (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
     pluginConfiguration: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"submitEditor", {

package/dist/types/plugins/block-type/index.d.ts

@@ -1,7 +1,9 @@
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import { BlockTypePluginOptions } from './types';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 declare const blockTypePlugin: NextEditorPlugin<'blockType', {
     pluginConfiguration: BlockTypePluginOptions | undefined;
+    dependencies: [OptionalPlugin<typeof analyticsPlugin>];
 }>;
 export default blockTypePlugin;
 export { pluginKey } from './pm-plugins/main';

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

@@ -5,6 +5,7 @@ import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
+import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 declare const cardPlugin: NextEditorPlugin<'card', {
     pluginConfiguration: CardPluginOptions;
     dependencies: [
@@ -12,7 +13,8 @@ declare const cardPlugin: NextEditorPlugin<'card', {
         typeof analyticsPlugin,
         typeof widthPlugin,
         typeof decorationsPlugin,
-        typeof gridPlugin
+        typeof gridPlugin,
+        FloatingToolbarPlugin
     ];
 }>;
 export default cardPlugin;

package/dist/types/plugins/card/ui/EditLinkToolbar.d.ts

@@ -4,9 +4,11 @@ import { Node } from 'prosemirror-model';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { LinkPickerOptions } from '@atlaskit/editor-common/types';
-import type { Command, FloatingToolbarItem, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
+import type { Command, FloatingToolbarItem, FloatingToolbarConfig, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { FeatureFlags } from '@atlaskit/editor-common/types';
+import type cardPlugin from '../index';
+import type { ForceFocusSelector } from '@atlaskit/editor-plugin-floating-toolbar';
 export type EditLinkToolbarProps = {
     view: EditorView;
     providerFactory: ProviderFactory;
@@ -16,6 +18,7 @@ export type EditLinkToolbarProps = {
     onSubmit?: (href: string, text?: string, analytic?: UIAnalyticsEvent | null | undefined) => void;
     linkPickerOptions?: LinkPickerOptions;
     featureFlags: FeatureFlags;
+    forceFocusSelector: ForceFocusSelector | undefined;
 };
 export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProps> {
     componentDidUpdate(prevProps: EditLinkToolbarProps): void;
@@ -28,11 +31,11 @@ export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProp
     render(): JSX.Element;
 }
 export declare const editLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker, featureFlags, editorAnalyticsApi, }: {
+export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker, featureFlags, pluginInjectionApi, }: {
     providerFactory: ProviderFactory;
     node: Node;
     linkPicker?: LinkPickerOptions | undefined;
     featureFlags: FeatureFlags;
-    editorAnalyticsApi: EditorAnalyticsAPI | undefined;
+    pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
 }) => FloatingToolbarItem<Command>;
 export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker: boolean) => Partial<FloatingToolbarConfig>;

package/dist/types/plugins/floating-toolbar/index.d.ts

@@ -1,9 +1,7 @@
 import { PluginKey, Selection, EditorState } from 'prosemirror-state';
 import { Node } from 'prosemirror-model';
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
 import { FloatingToolbarConfig } from './types';
-import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
-import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 export type FloatingToolbarPluginState = Record<'getConfigWithNodeInfo', (state: EditorState) => ConfigWithNodeInfo | null | undefined>;
 export type ConfigWithNodeInfo = {
     config: FloatingToolbarConfig | undefined;
@@ -11,9 +9,7 @@ export type ConfigWithNodeInfo = {
     node: Node;
 };
 export declare const getRelevantConfig: (selection: Selection<any>, configs: Array<FloatingToolbarConfig>) => ConfigWithNodeInfo | undefined;
-declare const floatingToolbarPlugin: NextEditorPlugin<'floatingToolbar', {
-    dependencies: [typeof featureFlagsPlugin, typeof decorationsPlugin];
-}>;
+declare const floatingToolbarPlugin: FloatingToolbarPlugin;
 export default floatingToolbarPlugin;
 /**
  *

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

@@ -9,6 +9,7 @@ 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 { MediaPluginState } from './pm-plugins/types';
+import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 export type { MediaState, MediaProvider, CustomMediaPicker };
 export { insertMediaSingleNode } from './utils/media-single';
 declare const mediaPlugin: NextEditorPlugin<'media', {
@@ -18,7 +19,8 @@ declare const mediaPlugin: NextEditorPlugin<'media', {
         OptionalPlugin<typeof analyticsPlugin>,
         typeof gridPlugin,
         typeof widthPlugin,
-        typeof decorationsPlugin
+        typeof decorationsPlugin,
+        FloatingToolbarPlugin
     ];
     sharedState: MediaPluginState | null;
 }>;

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

@@ -9,7 +9,7 @@ import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import { PortalProviderAPI } from '../../../../src/ui/PortalProvider';
 import { MediaPluginState } from '../pm-plugins/types';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
-import { DispatchAnalyticsEvent } from '../../analytics';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 export interface MediaInlineProps {
     mediaProvider: Promise<MediaProvider>;
     identifier: FileIdentifier;

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

@@ -3,7 +3,7 @@ import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import { Node as PMNode } from 'prosemirror-model';
 import { EditorView } from 'prosemirror-view';
 import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
-import { DispatchAnalyticsEvent } from '../../analytics';
+import { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { MediaOptions } from '../types';
 import { ProsemirrorGetPosHandler } from '../../../nodeviews';
 import { MediaTraceContext } from '@atlaskit/media-common';

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

@@ -6,7 +6,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { ProsemirrorGetPosHandler, ForwardRef } from '../../../nodeviews';
 import { EventDispatcher } from '../../../event-dispatcher';
 import { MediaOptions } from '../types';
-import { DispatchAnalyticsEvent } from '../../analytics';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { MediaPluginState } from '../pm-plugins/types';
 import type mediaPlugin from '../index';
 export interface MediaSingleNodeProps {

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

@@ -3,6 +3,8 @@ import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { IntlShape } from 'react-intl-next';
 import { FloatingToolbarConfig } from '../../floating-toolbar/types';
 import { MediaLinkingState } from '../pm-plugins/linking';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { MediaToolbarBaseConfig } from '../types';
+import type mediaPlugin from '../index';
 export declare function shouldShowMediaLinkToolbar(editorState: EditorState): boolean;
-export declare const getLinkingToolbar: (toolbarBaseConfig: MediaToolbarBaseConfig, mediaLinkingState: MediaLinkingState, state: EditorState, intl: IntlShape, providerFactory?: ProviderFactory) => FloatingToolbarConfig | undefined;
+export declare const getLinkingToolbar: (toolbarBaseConfig: MediaToolbarBaseConfig, mediaLinkingState: MediaLinkingState, state: EditorState, intl: IntlShape, pluginInjectionApi: ExtractInjectionAPI<typeof mediaPlugin> | undefined, providerFactory?: ProviderFactory) => FloatingToolbarConfig | undefined;

package/dist/types-ts4.5/labs/next/presets/cxhtml.d.ts

@@ -152,6 +152,9 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
         dependencies: [
             (config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
@@ -175,6 +178,9 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }>,
     (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>,
     (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {

package/dist/types-ts4.5/labs/next/presets/default.d.ts

@@ -181,6 +181,9 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
         dependencies: [
             (config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
@@ -204,6 +207,9 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }>,
     (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>,
     (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
@@ -472,6 +478,9 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
         dependencies: [
             (config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
@@ -495,6 +504,9 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }>,
     (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>,
     (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {

package/dist/types-ts4.5/labs/next/presets/mobile.d.ts

@@ -155,6 +155,9 @@ export declare function useMobilePreset({ media, placeholder, maxContentSize, cr
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
         dependencies: [
             (config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
@@ -178,6 +181,9 @@ export declare function useMobilePreset({ media, placeholder, maxContentSize, cr
                 };
             }>
         ];
+        actions: {
+            forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
+        };
     }>,
     (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>,
     (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {

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

@@ -1,7 +1,11 @@
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import { BlockTypePluginOptions } from './types';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 declare const blockTypePlugin: NextEditorPlugin<'blockType', {
     pluginConfiguration: BlockTypePluginOptions | undefined;
+    dependencies: [
+        OptionalPlugin<typeof analyticsPlugin>
+    ];
 }>;
 export default blockTypePlugin;
 export { pluginKey } from './pm-plugins/main';

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

@@ -5,6 +5,7 @@ import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
+import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 declare const cardPlugin: NextEditorPlugin<'card', {
     pluginConfiguration: CardPluginOptions;
     dependencies: [
@@ -12,7 +13,8 @@ declare const cardPlugin: NextEditorPlugin<'card', {
         typeof analyticsPlugin,
         typeof widthPlugin,
         typeof decorationsPlugin,
-        typeof gridPlugin
+        typeof gridPlugin,
+        FloatingToolbarPlugin
     ];
 }>;
 export default cardPlugin;