@atlaskit/editor-core 185.10.0 → 185.11.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 185.11.0
+
+### Minor Changes
+
+- [`f21b48e8a51`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f21b48e8a51) - enabled access to NextEditorPlugin actions for mobile bridge
+
+## 185.10.3
+
+### Patch Changes
+
+- [`6c6c3491dfa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6c6c3491dfa) - Move collab provider subscription into plugin#view methods to avoid race conditions with re-configuring editor state
+
 ## 185.10.0
 
 ### Minor Changes

package/composable-editor/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@atlaskit/editor-core/composable-editor",
+  "main": "../dist/cjs/composable-editor.js",
+  "module": "../dist/esm/composable-editor.js",
+  "module:es2019": "../dist/es2019/composable-editor.js",
+  "sideEffects": false,
+  "types": "../dist/types/composable-editor.d.ts",
+  "typesVersions": {
+    ">=4.5 <4.9": {
+      "*": [
+        "../dist/types-ts4.5/composable-editor.d.ts"
+      ]
+    }
+  }
+}

package/dist/cjs/composable-editor.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "Editor", {
+  enumerable: true,
+  get: function get() {
+    return _editorNext.default;
+  }
+});
+var _editorNext = _interopRequireDefault(require("./editor-next"));

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

@@ -18,6 +18,8 @@ var _types = require("../types");
 var _mark = require("../../../utils/mark");
 var _insert = require("@atlaskit/editor-common/insert");
 var _analytics = require("../../analytics");
+var _analytics2 = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _utils = require("../../../utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _editorTables = require("@atlaskit/editor-tables");
@@ -105,10 +107,10 @@ function withCurrentHeadingLevel(fn) {
 function setNormalTextWithAnalytics(inputMethod) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return (0, _analytics.withAnalytics)({
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
+      action: _analytics2.ACTION.FORMATTED,
+      actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
+      eventType: _analytics2.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics2.ACTION_SUBJECT_ID.FORMAT_HEADING,
       attributes: {
         inputMethod: inputMethod,
         newHeadingLevel: 0,
@@ -139,10 +141,10 @@ function setHeading(level) {
 var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return (0, _analytics.withAnalytics)({
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
+      action: _analytics2.ACTION.FORMATTED,
+      actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
+      eventType: _analytics2.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics2.ACTION_SUBJECT_ID.FORMAT_HEADING,
       attributes: {
         inputMethod: inputMethod,
         newHeadingLevel: newHeadingLevel,
@@ -175,39 +177,48 @@ function insertBlockType(name) {
     return false;
   };
 }
-var insertBlockTypesWithAnalytics = function insertBlockTypesWithAnalytics(name, inputMethod) {
+
+/**
+ *
+ * @param name - block type name
+ * @param inputMethod - input method
+ * @param editorAnalyticsApi - analytics api, undefined if not available either because it failed to load or wasn't added
+ * otherwise Editor becomes very sad and crashes
+ * @returns - command that inserts block type
+ */
+var insertBlockTypesWithAnalytics = function insertBlockTypesWithAnalytics(name, inputMethod, editorAnalyticsApi) {
   switch (name) {
     case _types.BLOCK_QUOTE.name:
-      return (0, _analytics.withAnalytics)({
-        action: _analytics.ACTION.FORMATTED,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
+        action: _analytics2.ACTION.FORMATTED,
+        actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
+        eventType: _analytics2.EVENT_TYPE.TRACK,
+        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
         attributes: {
           inputMethod: inputMethod
         }
       })(insertBlockType(name));
     case _types.CODE_BLOCK.name:
-      return (0, _analytics.withAnalytics)({
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.CODE_BLOCK,
+      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
+        action: _analytics2.ACTION.INSERTED,
+        actionSubject: _analytics2.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.CODE_BLOCK,
         attributes: {
           inputMethod: inputMethod
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _analytics2.EVENT_TYPE.TRACK
       })(insertBlockType(name));
     case _types.PANEL.name:
-      return (0, _analytics.withAnalytics)({
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.PANEL,
+      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
+        action: _analytics2.ACTION.INSERTED,
+        actionSubject: _analytics2.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.PANEL,
         attributes: {
           inputMethod: inputMethod,
           panelType: _adfSchema.PanelType.INFO // only info panels can be inserted from toolbar
         },
 
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _analytics2.EVENT_TYPE.TRACK
       })(insertBlockType(name));
     default:
       return insertBlockType(name);

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

@@ -142,9 +142,10 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
       {
         name: 'blockTypeKeyMap',
         plugin: function plugin(_ref5) {
+          var _api$dependencies$ana;
           var schema = _ref5.schema,
             featureFlags = _ref5.featureFlags;
-          return (0, _keymap.default)(schema, featureFlags);
+          return (0, _keymap.default)(schema, featureFlags, 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);
         }
       }];
     },
@@ -184,9 +185,9 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
-        var _api$dependencies$ana, _api$dependencies$ana2;
+        var _api$dependencies$ana2, _api$dependencies$ana3;
         var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-        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)));
+        return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -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)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions)));
       }
     }
   };

package/dist/cjs/plugins/block-type/pm-plugins/keymap.js

@@ -19,7 +19,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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 backspace = (0, _prosemirrorCommands.chainCommands)(_commands2.cleanUpAtTheStartOfDocument, (0, _commands2.deleteBlockContent)(_utils.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
 var del = (0, _prosemirrorCommands.chainCommands)((0, _commands3.deleteEmptyParagraphAndMoveBlockUp)(_utils.isNodeAWrappingBlockNode), (0, _commands2.deleteBlockContent)(_utils.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
-function keymapPlugin(schema, featureFlags) {
+function keymapPlugin(schema, featureFlags, editorAnalyticsApi) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);
   keymaps.bindKeymapWithCommand(keymaps.moveUp.common, commands.createNewParagraphAbove, list);
@@ -30,7 +30,7 @@ function keymapPlugin(schema, featureFlags) {
   keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, del, list);
   keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), (0, _commands2.insertBlockTypesWithAnalytics)(blockTypes.BLOCK_QUOTE.name, _analytics.INPUT_METHOD.KEYBOARD), list);
+    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), (0, _commands2.insertBlockTypesWithAnalytics)(blockTypes.BLOCK_QUOTE.name, _analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return (0, _keymap.keymap)(list);
 }

package/dist/cjs/plugins/collab-edit/index.js

@@ -94,14 +94,7 @@ var collabEditPlugin = function collabEditPlugin(options, api) {
         plugin: function plugin(_ref3) {
           var dispatch = _ref3.dispatch,
             providerFactory = _ref3.providerFactory;
-          providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
-            if (providerPromise) {
-              providerPromise.then(function (provider) {
-                return providerResolver(provider);
-              });
-            }
-          });
-          return (0, _plugin.createPlugin)(dispatch, providerFactory, executeProviderCode, options, featureFlags);
+          return (0, _plugin.createPlugin)(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
         }
       }]);
     },

package/dist/cjs/plugins/collab-edit/plugin.js

@@ -22,7 +22,7 @@ var _pluginState = require("./plugin-state");
 var _pluginKey = require("./plugin-key");
 var _analytics = require("./analytics");
 var _analytics2 = require("@atlaskit/editor-common/analytics");
-var createPlugin = function createPlugin(dispatch, providerFactory, collabProviderCallback, options, featureFlags) {
+var createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) {
   var fireAnalyticsCallback = (0, _analytics2.fireAnalyticsEvent)(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
   return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
@@ -75,6 +75,13 @@ var createPlugin = function createPlugin(dispatch, providerFactory, collabProvid
         providerFactory: providerFactory,
         featureFlags: featureFlags
       }), addErrorAnalytics);
+      providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
+        if (providerPromise) {
+          providerPromise.then(function (provider) {
+            return providerResolver(provider);
+          });
+        }
+      });
       return {
         destroy: function destroy() {
           providerFactory.unsubscribeAll('collabEditProvider');

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

@@ -43,8 +43,10 @@ var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize) {
  * Wrapper over insertBlockTypeWithAnalytics to autobind toolbar input method
  * @param name Block name
  */
-function handleInsertBlockType(name) {
-  return (0, _commands.insertBlockTypesWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR);
+function handleInsertBlockType(editorAnalyticsApi) {
+  return function (name) {
+    return (0, _commands.insertBlockTypesWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR, editorAnalyticsApi);
+  };
 }
 var insertBlockPlugin = function insertBlockPlugin() {
   var _api$dependencies, _api$dependencies$fea;
@@ -82,6 +84,7 @@ var insertBlockPlugin = function insertBlockPlugin() {
             layoutState: _layout.pluginKey
           },
           render: function render(_ref2) {
+            var _api$dependencies$ana;
             var mentionState = _ref2.mentionState,
               blockTypeState = _ref2.blockTypeState,
               mediaState = _ref2.mediaState,
@@ -121,7 +124,7 @@ var insertBlockPlugin = function insertBlockPlugin() {
               emojiProvider: providers.emojiProvider,
               nativeStatusSupported: options.nativeStatusSupported,
               horizontalRuleEnabled: options.horizontalRuleEnabled,
-              onInsertBlockType: handleInsertBlockType,
+              onInsertBlockType: handleInsertBlockType(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),
               onInsertMacroFromMacroBrowser: _macro.insertMacroFromMacroBrowser,
               macroProvider: macroState.macroProvider,
               popupsMountPoint: popupsMountPoint,

package/dist/cjs/preset-universal.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "useUniversalPreset", {
+  enumerable: true,
+  get: function get() {
+    return _useUniversalPreset.default;
+  }
+});
+var _useUniversalPreset = _interopRequireDefault(require("./labs/next/presets/useUniversalPreset"));

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.10.0";
+var version = "185.11.0";
 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.10.0",
+	"version": "185.11.0",
 	"sideEffects": false
 }

package/dist/es2019/composable-editor.js

@@ -0,0 +1 @@
+export { default as Editor } from './editor-next';

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

@@ -3,7 +3,9 @@ import { safeInsert } from 'prosemirror-utils';
 import { CODE_BLOCK, BLOCK_QUOTE, PANEL, HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
 import { removeBlockMarks } from '../../../utils/mark';
 import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
-import { withAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../analytics';
+import { withAnalytics as withAnalyticsDeprecated } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { filterChildrenBetween } from '../../../utils';
 import { PanelType } from '@atlaskit/adf-schema';
 import { CellSelection } from '@atlaskit/editor-tables';
@@ -85,7 +87,7 @@ function withCurrentHeadingLevel(fn) {
   };
 }
 export function setNormalTextWithAnalytics(inputMethod) {
-  return withCurrentHeadingLevel(previousHeadingLevel => withAnalytics({
+  return withCurrentHeadingLevel(previousHeadingLevel => withAnalyticsDeprecated({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,
@@ -120,7 +122,7 @@ export function setHeading(level) {
   };
 }
 export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod) => {
-  return withCurrentHeadingLevel(previousHeadingLevel => withAnalytics({
+  return withCurrentHeadingLevel(previousHeadingLevel => withAnalyticsDeprecated({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,
@@ -157,10 +159,19 @@ export function insertBlockType(name) {
     return false;
   };
 }
-export const insertBlockTypesWithAnalytics = (name, inputMethod) => {
+
+/**
+ *
+ * @param name - block type name
+ * @param inputMethod - input method
+ * @param editorAnalyticsApi - analytics api, undefined if not available either because it failed to load or wasn't added
+ * otherwise Editor becomes very sad and crashes
+ * @returns - command that inserts block type
+ */
+export const insertBlockTypesWithAnalytics = (name, inputMethod, editorAnalyticsApi) => {
   switch (name) {
     case BLOCK_QUOTE.name:
-      return withAnalytics({
+      return withAnalytics(editorAnalyticsApi, {
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
         eventType: EVENT_TYPE.TRACK,
@@ -170,7 +181,7 @@ export const insertBlockTypesWithAnalytics = (name, inputMethod) => {
         }
       })(insertBlockType(name));
     case CODE_BLOCK.name:
-      return withAnalytics({
+      return withAnalytics(editorAnalyticsApi, {
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
@@ -180,7 +191,7 @@ export const insertBlockTypesWithAnalytics = (name, inputMethod) => {
         eventType: EVENT_TYPE.TRACK
       })(insertBlockType(name));
     case PANEL.name:
-      return withAnalytics({
+      return withAnalytics(editorAnalyticsApi, {
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.PANEL,

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

@@ -120,7 +120,10 @@ const blockTypePlugin = (options, api) => ({
       plugin: ({
         schema,
         featureFlags
-      }) => keymapPlugin(schema, featureFlags)
+      }) => {
+        var _api$dependencies$ana;
+        return keymapPlugin(schema, featureFlags, 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);
+      }
     }];
   },
   primaryToolbarComponent({
@@ -159,9 +162,9 @@ const blockTypePlugin = (options, api) => ({
   },
   pluginsOptions: {
     quickInsert: intl => {
-      var _api$dependencies$ana, _api$dependencies$ana2;
+      var _api$dependencies$ana2, _api$dependencies$ana3;
       const exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-      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)];
+      return [...blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -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), ...headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions)];
     }
   }
 });

package/dist/es2019/plugins/block-type/pm-plugins/keymap.js

@@ -10,7 +10,7 @@ import { INPUT_METHOD } from '../../analytics';
 import { isNodeAWrappingBlockNode } from '../utils';
 const backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
-export default function keymapPlugin(schema, featureFlags) {
+export default function keymapPlugin(schema, featureFlags, editorAnalyticsApi) {
   const list = {};
   keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);
   keymaps.bindKeymapWithCommand(keymaps.moveUp.common, commands.createNewParagraphAbove, list);
@@ -21,7 +21,7 @@ export default function keymapPlugin(schema, featureFlags) {
   keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, del, list);
   keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD), list);
+    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return keymap(list);
 }

package/dist/es2019/plugins/collab-edit/index.js

@@ -50,12 +50,7 @@ const collabEditPlugin = (options, api) => {
           dispatch,
           providerFactory
         }) => {
-          providerFactory && providerFactory.subscribe('collabEditProvider', (_name, providerPromise) => {
-            if (providerPromise) {
-              providerPromise.then(provider => providerResolver(provider));
-            }
-          });
-          return createPlugin(dispatch, providerFactory, executeProviderCode, options, featureFlags);
+          return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
         }
       }];
     },

package/dist/es2019/plugins/collab-edit/plugin.js

@@ -5,7 +5,7 @@ import { pluginKey } from './plugin-key';
 import { addSynchronyErrorAnalytics } from './analytics';
 import { fireAnalyticsEvent, ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 export { PluginState, pluginKey };
-export const createPlugin = (dispatch, providerFactory, collabProviderCallback, options, featureFlags) => {
+export const createPlugin = (dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) => {
   const fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
   return new SafePlugin({
     key: pluginKey,
@@ -58,6 +58,11 @@ export const createPlugin = (dispatch, providerFactory, collabProviderCallback,
         providerFactory,
         featureFlags
       }), addErrorAnalytics);
+      providerFactory && providerFactory.subscribe('collabEditProvider', (_name, providerPromise) => {
+        if (providerPromise) {
+          providerPromise.then(provider => providerResolver(provider));
+        }
+      });
       return {
         destroy() {
           providerFactory.unsubscribeAll('collabEditProvider');

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

@@ -36,8 +36,8 @@ const toolbarSizeToButtons = toolbarSize => {
  * Wrapper over insertBlockTypeWithAnalytics to autobind toolbar input method
  * @param name Block name
  */
-function handleInsertBlockType(name) {
-  return insertBlockTypesWithAnalytics(name, INPUT_METHOD.TOOLBAR);
+function handleInsertBlockType(editorAnalyticsApi) {
+  return name => insertBlockTypesWithAnalytics(name, INPUT_METHOD.TOOLBAR, editorAnalyticsApi);
 }
 const insertBlockPlugin = (options = {}, api) => {
   var _api$dependencies, _api$dependencies$fea;
@@ -84,48 +84,51 @@ const insertBlockPlugin = (options = {}, api) => {
             imageUpload,
             placeholderTextState,
             layoutState
-          }) => /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
-            pluginInjectionApi: api,
-            buttons: buttons,
-            isReducedSpacing: isToolbarReducedSpacing,
-            isDisabled: disabled,
-            isTypeAheadAllowed: isTypeAheadAllowed(editorView.state),
-            editorView: editorView,
-            tableSupported: !!editorView.state.schema.nodes.table,
-            actionSupported: !!editorView.state.schema.nodes.taskItem,
-            mentionsSupported: !!(mentionState && mentionState.mentionProvider),
-            decisionSupported: !!editorView.state.schema.nodes.decisionItem,
-            dateEnabled: !!dateState,
-            placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
-            layoutSectionEnabled: !!layoutState,
-            expandEnabled: !!options.allowExpand,
-            mediaUploadsEnabled: mediaState && mediaState.allowsUploads,
-            onShowMediaPicker: mediaState && mediaState.showMediaPicker,
-            mediaSupported: !!mediaState,
-            imageUploadSupported: !!imageUpload,
-            imageUploadEnabled: imageUpload && imageUpload.enabled,
-            handleImageUpload: startImageUpload,
-            availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
-            linkSupported: !!hyperlinkState,
-            linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
-            emojiDisabled: !emojiState || !emojiState.emojiProvider,
-            emojiProvider: providers.emojiProvider,
-            nativeStatusSupported: options.nativeStatusSupported,
-            horizontalRuleEnabled: options.horizontalRuleEnabled,
-            onInsertBlockType: handleInsertBlockType,
-            onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser,
-            macroProvider: macroState.macroProvider,
-            popupsMountPoint: popupsMountPoint,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsScrollableElement: popupsScrollableElement,
-            insertMenuItems: options.insertMenuItems,
-            editorActions: editorActions,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
-            showElementBrowserLink: options.showElementBrowserLink,
-            showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
-            featureFlags: featureFlags
-          })
+          }) => {
+            var _api$dependencies$ana;
+            return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
+              pluginInjectionApi: api,
+              buttons: buttons,
+              isReducedSpacing: isToolbarReducedSpacing,
+              isDisabled: disabled,
+              isTypeAheadAllowed: isTypeAheadAllowed(editorView.state),
+              editorView: editorView,
+              tableSupported: !!editorView.state.schema.nodes.table,
+              actionSupported: !!editorView.state.schema.nodes.taskItem,
+              mentionsSupported: !!(mentionState && mentionState.mentionProvider),
+              decisionSupported: !!editorView.state.schema.nodes.decisionItem,
+              dateEnabled: !!dateState,
+              placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
+              layoutSectionEnabled: !!layoutState,
+              expandEnabled: !!options.allowExpand,
+              mediaUploadsEnabled: mediaState && mediaState.allowsUploads,
+              onShowMediaPicker: mediaState && mediaState.showMediaPicker,
+              mediaSupported: !!mediaState,
+              imageUploadSupported: !!imageUpload,
+              imageUploadEnabled: imageUpload && imageUpload.enabled,
+              handleImageUpload: startImageUpload,
+              availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
+              linkSupported: !!hyperlinkState,
+              linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
+              emojiDisabled: !emojiState || !emojiState.emojiProvider,
+              emojiProvider: providers.emojiProvider,
+              nativeStatusSupported: options.nativeStatusSupported,
+              horizontalRuleEnabled: options.horizontalRuleEnabled,
+              onInsertBlockType: handleInsertBlockType(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),
+              onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser,
+              macroProvider: macroState.macroProvider,
+              popupsMountPoint: popupsMountPoint,
+              popupsBoundariesElement: popupsBoundariesElement,
+              popupsScrollableElement: popupsScrollableElement,
+              insertMenuItems: options.insertMenuItems,
+              editorActions: editorActions,
+              dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+              replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
+              showElementBrowserLink: options.showElementBrowserLink,
+              showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
+              featureFlags: featureFlags
+            });
+          }
         });
       };
       return /*#__PURE__*/React.createElement(WithProviders, {

package/dist/es2019/preset-universal.js

@@ -0,0 +1 @@
+export { default as useUniversalPreset } from './labs/next/presets/useUniversalPreset';

package/dist/es2019/version-wrapper.js

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

package/dist/esm/composable-editor.js

@@ -0,0 +1 @@
+export { default as Editor } from './editor-next';