@atlaskit/editor-core 185.2.2 → 185.2.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 185.2.7
+
+### Patch Changes
+
+- [`1259df9a9ef`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1259df9a9ef) - converted some of block-type's analytics to use new EditorAnalyticsAPI
+
+## 185.2.5
+
+### Patch Changes
+
+- [`b48d0a5f88f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b48d0a5f88f) - Create new placeholder for the floating toolbar plugin and use a new action to replace the forceFocusSelector action.
+- Updated dependencies
+
 ## 185.2.2
 
 ### Patch Changes

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

@@ -21,14 +21,14 @@ var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _ToolbarBlockType = _interopRequireDefault(require("./ui/ToolbarBlockType"));
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 var _commands = require("./commands");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var keymaps = _interopRequireWildcard(require("../../keymaps"));
 var _assets = require("../quick-insert/assets");
 var _messages = require("./messages");
 var _types = require("../../ui/Toolbar/types");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
+var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
     return [];
@@ -56,7 +56,7 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
         var tr = insert(state.schema.nodes.heading.createChecked({
           level: level
         }));
-        return (0, _analytics.addAnalytics)(state, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: _analytics.ACTION.FORMATTED,
           actionSubject: _analytics.ACTION_SUBJECT.TEXT,
           eventType: _analytics.EVENT_TYPE.TRACK,
@@ -65,12 +65,13 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
             inputMethod: _analytics.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 [];
@@ -86,7 +87,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 (0, _analytics.addAnalytics)(state, tr, {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
         eventType: _analytics.EVENT_TYPE.TRACK,
@@ -94,11 +95,12 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
         attributes: {
           inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
         }
-      });
+      })(tr);
+      return tr;
     }
   }];
 };
-var blockTypePlugin = function blockTypePlugin(options) {
+var blockTypePlugin = function blockTypePlugin(options, api) {
   return {
     name: 'blockType',
     nodes: function nodes() {
@@ -182,8 +184,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((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1)));
+        return [].concat((0, _toConsumableArray2.default)(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)), (0, _toConsumableArray2.default)(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/cjs/plugins/card/nodeviews/embedCard.js

@@ -78,8 +78,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/cjs/plugins/card/nodeviews/genericCard.js

@@ -87,6 +87,7 @@ 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
           });
@@ -100,7 +101,7 @@ function Card(SmartCardComponent, UnsupportedComponent) {
           if (!getPos || typeof getPos === 'boolean') {
             return;
           }
-          (0, _doc.changeSelectedCardToLinkFallback)(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.analytics.actions)(view.state, view.dispatch);
+          (0, _doc.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/cjs/plugins/card/toolbar.js

@@ -202,7 +202,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/cjs/plugins/card/ui/EditLinkToolbar.js

@@ -21,7 +21,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _doc = require("../pm-plugins/doc");
 var _utils = require("../utils");
 var _prosemirrorState = require("prosemirror-state");
-var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
 var _messages = require("@atlaskit/editor-common/messages");
 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; } }
@@ -40,7 +39,8 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
      * and not close the floating toolbar.
      */
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleEsc", function (e) {
-      (0, _forceFocus.forceFocusSelector)("[aria-label=\"".concat(_messages.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(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
     });
     return _this;
   }
@@ -66,14 +66,14 @@ 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.default.createElement(HyperLinkToolbarWithListeners, {
         view: view,
         linkPickerOptions: linkPickerOptions,
@@ -120,12 +120,13 @@ 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;
       }
@@ -139,6 +140,7 @@ 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;
@@ -146,7 +148,8 @@ 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 (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(newText, newHref, undefined, undefined, undefined, editorAnalyticsApi), {
+            var _pluginInjectionApi$d2;
+            return (0, _card.commandWithMetadata)((0, _doc.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: _analytics.ACTION.UPDATED,
               sourceEvent: analytic
             })(view.state, view.dispatch);

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -25,7 +26,9 @@ var _ToolbarLoader = require("./ui/ToolbarLoader");
 var _utils = require("./utils");
 var _ErrorBoundary = require("../../ui/ErrorBoundary");
 var _toolbar = require("../copy-button/toolbar");
-var _forceFocus = _interopRequireDefault(require("./pm-plugins/force-focus"));
+var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
@@ -153,6 +156,9 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
         }
       }];
     },
+    actions: {
+      forceFocusSelector: _forceFocus.forceFocusSelector
+    },
     contentComponent: function contentComponent(_ref3) {
       var popupsMountPoint = _ref3.popupsMountPoint,
         popupsBoundariesElement = _ref3.popupsBoundariesElement,

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

@@ -13,7 +13,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _ui = require("@atlaskit/editor-common/ui");
 var _mediaClient = require("@atlaskit/media-client");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _helpers = require("../commands/helpers");
 var MediaNodeUpdater = /*#__PURE__*/function () {
   function MediaNodeUpdater(props) {

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

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

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

@@ -12,7 +12,6 @@ var _linking = require("../commands/linking");
 var _linking2 = require("../pm-plugins/linking");
 var _MediaLinkingToolbar = _interopRequireDefault(require("../ui/MediaLinkingToolbar"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FORCE_FOCUS_SELECTOR = '[data-testid="add-link-button"],[data-testid="edit-link-button"]';
@@ -32,7 +31,7 @@ function shouldShowMediaLinkToolbar(editorState) {
     parent = _editorState$doc$reso.parent;
   return parent && parent.type.allowsMarkType(link);
 }
-var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, mediaLinkingState, state, intl, providerFactory) {
+var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory) {
   var link = mediaLinkingState.link,
     visible = mediaLinkingState.visible,
     editing = mediaLinkingState.editable,
@@ -68,11 +67,12 @@ var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, mediaLinki
                 (0, _linking.hideLinkingToolbar)(view.state, view.dispatch, view);
               },
               onCancel: function onCancel() {
+                var _pluginInjectionApi$d;
                 (0, _linking.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.
                  */
-                (0, _forceFocus.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) {
                 (0, _linking.setUrlToMedia)(href, meta.inputMethod)(view.state, view.dispatch, view);

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 = "185.2.2";
+var version = "185.2.7";
 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": "185.2.2",
+	"version": "185.2.7",
 	"sideEffects": false
 }

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

@@ -6,14 +6,14 @@ 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';
 const headingPluginOptions = ({
   formatMessage
-}, isAllowed) => {
+}, isAllowed, editorAnalyticsApi) => {
   if (!isAllowed) {
     return [];
   }
@@ -38,7 +38,7 @@ const headingPluginOptions = ({
         const tr = insert(state.schema.nodes.heading.createChecked({
           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,
@@ -47,14 +47,15 @@ const headingPluginOptions = ({
             inputMethod: INPUT_METHOD.QUICK_INSERT,
             newHeadingLevel: level
           }
-        });
+        })(tr);
+        return tr;
       }
     };
   });
 };
 const blockquotePluginOptions = ({
   formatMessage
-}, isAllowed) => {
+}, isAllowed, editorAnalyticsApi) => {
   if (!isAllowed) {
     return [];
   }
@@ -67,7 +68,7 @@ const blockquotePluginOptions = ({
     icon: () => /*#__PURE__*/React.createElement(IconQuote, null),
     action(insert, state) {
       const 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,
@@ -75,11 +76,12 @@ const blockquotePluginOptions = ({
         attributes: {
           inputMethod: INPUT_METHOD.QUICK_INSERT
         }
-      });
+      })(tr);
+      return tr;
     }
   }];
 };
-const blockTypePlugin = options => ({
+const blockTypePlugin = (options, api) => ({
   name: 'blockType',
   nodes() {
     const nodes = [{
@@ -157,8 +159,9 @@ const blockTypePlugin = options => ({
   },
   pluginsOptions: {
     quickInsert: intl => {
+      var _api$dependencies$ana, _api$dependencies$ana2;
       const exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-      return [...blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1), ...headingPluginOptions(intl, exclude.indexOf('heading') === -1)];
+      return [...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), ...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/es2019/plugins/card/nodeviews/embedCard.js

@@ -62,8 +62,8 @@ const CardInner = ({
     }), smartCard);
   }
   const 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,
       gridType,
       highlight: highlight

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

@@ -61,6 +61,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
         });
@@ -76,7 +77,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/es2019/plugins/card/toolbar.js

@@ -195,7 +195,7 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       linkPicker,
       node,
       featureFlags,
-      editorAnalyticsApi
+      pluginInjectionApi
     })];
   } else {
     const {

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

@@ -9,7 +9,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';
 const HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export class EditLinkToolbar extends React.Component {
@@ -19,7 +18,8 @@ export class EditLinkToolbar extends React.Component {
      * and not close the floating toolbar.
      */
     _defineProperty(this, "handleEsc", e => {
-      forceFocusSelector(`[aria-label="${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="${linkToolbarMessages.editLink.defaultMessage}"]`, this.props.view);
     });
   }
   componentDidUpdate(prevProps) {
@@ -88,13 +88,14 @@ export const buildEditLinkToolbar = ({
   node,
   linkPicker,
   featureFlags,
-  editorAnalyticsApi
+  pluginInjectionApi
 }) => {
   return {
     type: 'custom',
     disableArrowNavigation: true,
     fallback: [],
     render: (view, idx) => {
+      var _pluginInjectionApi$d;
       if (!view || !providerFactory) {
         return null;
       }
@@ -108,6 +109,7 @@ export const buildEditLinkToolbar = ({
         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: (newHref, newText, analytic) => {
           const urlChanged = newHref !== displayInfo.url;
           const titleChanged = newText !== displayInfo.title;
@@ -115,7 +117,8 @@ export const buildEditLinkToolbar = ({
           // 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/es2019/plugins/floating-toolbar/index.js

@@ -19,7 +19,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 const getRelevantConfig = (selection, configs) => {
   // node selections always take precedence, see if
   let configPair;
@@ -140,6 +140,9 @@ const floatingToolbarPlugin = (_, api) => {
         plugin: () => forceFocusPlugin()
       }];
     },
+    actions: {
+      forceFocusSelector
+    },
     contentComponent({
       popupsMountPoint,
       popupsBoundariesElement,

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import uuidV4 from 'uuid/v4';
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
 import { getMediaClient, 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 class MediaNodeUpdater {
   constructor(props) {

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

@@ -351,7 +351,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     getDomRef: () => mediaPluginState.element
   };
   if (allowLinking && mediaLinkingState && mediaLinkingState.visible && shouldShowMediaLinkToolbar(state)) {
-    const linkingToolbar = getLinkingToolbar(baseToolbar, mediaLinkingState, state, intl, providerFactory);
+    const linkingToolbar = getLinkingToolbar(baseToolbar, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory);
     if (linkingToolbar) {
       return linkingToolbar;
     }

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

@@ -3,7 +3,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';
 const FORCE_FOCUS_SELECTOR = '[data-testid="add-link-button"],[data-testid="edit-link-button"]';
 export function shouldShowMediaLinkToolbar(editorState) {
   const mediaLinkingState = getMediaLinkingState(editorState);
@@ -27,7 +26,7 @@ export function shouldShowMediaLinkToolbar(editorState) {
   } = editorState.doc.resolve(mediaLinkingState.mediaPos);
   return parent && parent.type.allowsMarkType(link);
 }
-export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, intl, providerFactory) => {
+export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory) => {
   const {
     link,
     visible,
@@ -64,11 +63,12 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
                 hideLinkingToolbar(view.state, view.dispatch, view);
               },
               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: (href, meta) => {
                 setUrlToMedia(href, meta.inputMethod)(view.state, view.dispatch, view);

package/dist/es2019/version-wrapper.js

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