@atlaskit/editor-core 185.13.0 → 185.14.0

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

@@ -2,6 +2,7 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
+import { createEditorSelectionAPI } from '../../../selection-api/api';
 import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
 import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
@@ -12,7 +13,6 @@ import { isFullPage as fullPageCheck } from '../../../utils/is-full-page';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createDefaultPreset } from './default';
 import { shouldForceTracking } from '@atlaskit/editor-common/utils';
-import { createStubInternalApis } from './create-stub-internal-apis';
 /**
  * Creates a preset with all of the available plugins.
  * Basis for create-plugins-list and can be used to migrate from Editor -> EditorNext (Presets project)
@@ -24,17 +24,14 @@ import { createStubInternalApis } from './create-stub-internal-apis';
  * @param prevAppearance The appearance of the editor in the previous render
  * @returns a full featured preset configured according to the provided props - basis for create-plugins-list
  */
-export default function createUniversalPreset(appearance, props, featureFlags, prevAppearance, maybeCreateAnalyticsEvent) {
+export default function createUniversalPreset(appearance, props, featureFlags, prevAppearance, createAnalyticsEvent) {
   var isMobile = appearance === 'mobile';
   var isComment = appearance === 'comment';
   var isFullPage = fullPageCheck(appearance);
   var getEditorFeatureFlags = function getEditorFeatureFlags() {
     return featureFlags;
   };
-  var stubs = createStubInternalApis();
-  var editorSelectionAPI = stubs.editorSelectionAPI,
-    stubInternalApisPlugin = stubs.stubInternalApisPlugin;
-  var createAnalyticsEvent = maybeCreateAnalyticsEvent ? maybeCreateAnalyticsEvent : stubs.createAnalyticsEvent;
+  var editorSelectionAPI = createEditorSelectionAPI();
   var defaultPreset = createDefaultPreset(_objectSpread(_objectSpread({}, props), {}, {
     createAnalyticsEvent: createAnalyticsEvent
   }));
@@ -45,7 +42,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     }
     return false;
   };
-  var finalPreset = defaultPreset.add(stubInternalApisPlugin).add(dataConsumerMarkPlugin).add(contentInsertionPlugin).maybeAdd(breakoutPlugin, function (plugin, builder) {
+  var finalPreset = defaultPreset.add(dataConsumerMarkPlugin).add(contentInsertionPlugin).maybeAdd(breakoutPlugin, function (plugin, builder) {
     if (props.allowBreakout && isFullPage) {
       return builder.add([plugin, {
         allowBreakoutButton: appearance === 'full-page'
@@ -121,7 +118,6 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     if (props.mentionProvider) {
       var _props$mention$insert, _props$mention, _props$mention2;
       return builder.add([plugin, {
-        createAnalyticsEvent: createAnalyticsEvent,
         sanitizePrivateContent: props.sanitizePrivateContent,
         insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
         allowZeroWidthSpaceAfter: !isMobile,
@@ -131,9 +127,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     return builder;
   }).maybeAdd(emojiPlugin, function (plugin, builder) {
     if (props.emojiProvider) {
-      return builder.add([plugin, {
-        createAnalyticsEvent: createAnalyticsEvent
-      }]);
+      return builder.add(plugin);
     }
     return builder;
   }).maybeAdd(tablesPlugin, function (plugin, builder) {
@@ -195,8 +189,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     if (props.collabEdit || props.collabEditProvider) {
       var _collabEditOptions$EX;
       var collabEditOptions = {
-        sanitizePrivateContent: props.sanitizePrivateContent,
-        createAnalyticsEvent: createAnalyticsEvent
+        sanitizePrivateContent: props.sanitizePrivateContent
       };
       if (props.collabEdit) {
         collabEditOptions = _objectSpread(_objectSpread({}, props.collabEdit), collabEditOptions);
@@ -285,7 +278,6 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       return builder.add([plugin, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props.UNSAFE_cards), props.smartLinks), (_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.smartLinks), {}, {
         platform: isMobile ? 'mobile' : 'web',
         fullWidthMode: fullWidthMode,
-        createAnalyticsEvent: createAnalyticsEvent,
         linkPicker: (_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.linkPicker,
         editorAppearance: appearance
       })]);

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

@@ -1,13 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { useLayoutEffect, useState } from 'react';
-import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { usePreviousState } from '@atlaskit/editor-common/hooks';
 import { createPreset } from '../../../create-editor/create-plugins-list';
 import { shouldRecreatePreset } from '../../../create-editor/preset-utils';
 export default function useUniversalPreset(_ref) {
   var props = _ref.props;
-  var _useAnalyticsEvents = useAnalyticsEvents(),
-    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var previousEditorProps = usePreviousState(props);
   var _useState = useState(function () {
       return createPreset(props, previousEditorProps);
@@ -23,7 +20,7 @@ export default function useUniversalPreset(_ref) {
     if (!recreate) {
       return;
     }
-    setPreset(createPreset(props, previousEditorProps, createAnalyticsEvent));
-  }, [props, previousEditorProps, createAnalyticsEvent]);
+    setPreset(createPreset(props, previousEditorProps));
+  }, [props, previousEditorProps]);
   return preset;
 }

package/dist/esm/plugins/analytics/plugin.js

@@ -9,25 +9,32 @@ import { isPerformanceAPIAvailable, measureRender } from '@atlaskit/editor-commo
 import { ACTION, EVENT_TYPE } from './types';
 import { analyticsPluginKey } from './plugin-key';
 import { fireAnalyticsEvent, getAnalyticsEventsFromTransaction } from '@atlaskit/editor-common/analytics';
-function createPlugin(options, featureFlags, editorAnalyticsApi) {
-  if (!options || !options.createAnalyticsEvent) {
+function createPlugin(options, featureFlags, pluginInjectionApi) {
+  if (!options) {
     return;
   }
   var hasRequiredPerformanceAPIs = isPerformanceAPIAvailable();
+  var getCreateAnalyticsEvent = function getCreateAnalyticsEvent() {
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.sharedState.currentState()) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.createAnalyticsEvent;
+  };
   return new SafePlugin({
     key: analyticsPluginKey,
     state: {
       init: function init() {
+        var _pluginInjectionApi$d3;
         return _objectSpread(_objectSpread({}, options), {}, {
+          createAnalyticsEvent: getCreateAnalyticsEvent(),
           fireAnalytics: fireAnalyticsEvent(options.createAnalyticsEvent),
-          editorAnalyticsApi: editorAnalyticsApi
+          editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.actions
         });
       },
       apply: function apply(tr, pluginState, _, state) {
-        if (pluginState.createAnalyticsEvent !== options.createAnalyticsEvent) {
+        if (pluginState.createAnalyticsEvent !== getCreateAnalyticsEvent()) {
+          var _options$createAnalyt;
           // When the plugin state is reconfigured, the init function isn't called again
           return _objectSpread(_objectSpread({}, pluginState), {}, {
-            createAnalyticsEvent: options.createAnalyticsEvent
+            createAnalyticsEvent: (_options$createAnalyt = options.createAnalyticsEvent) !== null && _options$createAnalyt !== void 0 ? _options$createAnalyt : getCreateAnalyticsEvent()
           });
         }
         if (featureFlags.catchAllTracking) {
@@ -93,8 +100,7 @@ var analyticsPlugin = function analyticsPlugin(options, api) {
       return [{
         name: 'analyticsPlugin',
         plugin: function plugin() {
-          var _api$dependencies, _api$dependencies$ana;
-          return createPlugin(options, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$ana = _api$dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
+          return createPlugin(options, featureFlags, api);
         }
       }];
     }

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -14,7 +14,6 @@ import { appearanceForNodeType, selectedCardAppearance } from '../utils';
 import { queueCards, resolveCard, hideDatasourceModal } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
-
 /**
  * Attempt to replace the link into the respective card.
  */
@@ -45,7 +44,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
   return $pos.node($pos.depth - 1).type.name;
 }
-export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi) {
+export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi, createAnalyticsEvent) {
   return function (editorState, dispatch) {
     var state = pluginKey.getState(editorState);
     if (!state) {
@@ -81,7 +80,7 @@ export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, car
           _url$split2 = _slicedToArray(_url$split, 3),
           domainName = _url$split2[2];
         if (state.smartLinkEvents) {
-          state.smartLinkEvents.insertSmartLink(domainName, 'inline', state.createAnalyticsEvent);
+          state.smartLinkEvents.insertSmartLink(domainName, 'inline', createAnalyticsEvent);
         }
 
         /**

package/dist/esm/plugins/card/pm-plugins/main.js

@@ -16,6 +16,7 @@ import { DATASOURCE_INNER_CONTAINER_CLASSNAME } from '@atlaskit/editor-common/st
 import { setDatasourceTableRef, setCardLayoutAndDatasourceTableRef } from './actions';
 import { findDomRefAtPos } from 'prosemirror-utils';
 export { pluginKey } from './plugin-key';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 export var createPlugin = function createPlugin(options, pluginInjectionApi) {
   return function (pmPluginFactoryParams) {
     var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
@@ -25,8 +26,15 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       allowResizing = options.allowResizing,
       useAlternativePreloader = options.useAlternativePreloader,
       fullWidthMode = options.fullWidthMode,
-      createAnalyticsEvent = options.createAnalyticsEvent,
       showServerActions = options.showServerActions;
+    var inlineCardViewProducer = getInlineNodeViewProducer({
+      pmPluginFactoryParams: pmPluginFactoryParams,
+      Component: InlineCardNodeView,
+      extraComponentProps: {
+        useAlternativePreloader: useAlternativePreloader,
+        showServerActions: showServerActions
+      }
+    });
     return new SafePlugin({
       state: {
         init: function init() {
@@ -37,7 +45,6 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             showLinkingToolbar: false,
             smartLinkEvents: undefined,
             smartLinkEventsNext: undefined,
-            createAnalyticsEvent: createAnalyticsEvent,
             editorAppearance: editorAppearance,
             showDatasourceModal: false,
             datasourceTableRef: undefined,
@@ -119,8 +126,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
                  * other tasks as per common implementations of the JavaScript event loop in browsers.
                  */
                 var invoke = rafSchedule(function () {
-                  var _pluginInjectionApi$d;
-                  return resolveWithProvider(view, provider, request, options, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions);
+                  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+                  return resolveWithProvider(view, provider, request, options, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions, (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.sharedState.currentState()) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.createAnalyticsEvent) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : undefined);
                 });
                 rafCancellationCallbacks.push(invoke.cancel);
                 invoke();
@@ -139,15 +146,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       },
       props: {
         nodeViews: {
-          inlineCard: getInlineNodeViewProducer({
-            pmPluginFactoryParams: pmPluginFactoryParams,
-            Component: InlineCardNodeView,
-            extraComponentProps: {
-              useAlternativePreloader: useAlternativePreloader,
-              showServerActions: showServerActions
-            }
-          }),
-          blockCard: function blockCard(node, view, getPos) {
+          inlineCard: inlineCardViewProducer,
+          blockCard: function blockCard(node, view, getPos, decorations) {
             var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -158,15 +158,20 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var hasIntlContext = true;
             var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
             if (isDatasource) {
-              return new Datasource({
-                node: node,
-                view: view,
-                getPos: getPos,
-                portalProviderAPI: portalProviderAPI,
-                eventDispatcher: eventDispatcher,
-                hasIntlContext: hasIntlContext,
-                pluginInjectionApi: pluginInjectionApi
-              }).init();
+              var _node$attrs4;
+              if (canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+                return new Datasource({
+                  node: node,
+                  view: view,
+                  getPos: getPos,
+                  portalProviderAPI: portalProviderAPI,
+                  eventDispatcher: eventDispatcher,
+                  hasIntlContext: hasIntlContext,
+                  pluginInjectionApi: pluginInjectionApi
+                }).init();
+              } else {
+                return inlineCardViewProducer(node, view, getPos, decorations);
+              }
             }
             return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           },

package/dist/esm/plugins/card/pm-plugins/util/resolve.js

@@ -5,14 +5,14 @@ import { replaceQueuedUrlWithCard, handleFallbackWithAnalytics } from '../doc';
 // ============================================================================ //
 // Used for all interactions with the EditorCardProvider.
 // ============================================================================ //
-export var resolveWithProvider = function resolveWithProvider(view, provider, request, options, editorAnalyticsApi) {
+export var resolveWithProvider = function resolveWithProvider(view, provider, request, options, editorAnalyticsApi, createAnalyticsEvent) {
   // When user manually changes appearance from blue link to smart link, we should respect that,
   var shouldForceAppearance =
   // This flag is set to true only in one place atm:
   // packages/editor/editor-core/src/plugins/card/pm-plugins/doc.ts @ convertHyperlinkToSmartCard
   // Which is used when user switching from URL to smart link appearance.
   !!request.shouldReplaceLink;
-  var handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, editorAnalyticsApi, options), handleRejected(view, request, editorAnalyticsApi));
+  var handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, editorAnalyticsApi, createAnalyticsEvent, options), handleRejected(view, request, editorAnalyticsApi));
   return handleResolve;
 };
 var updateCardType = function updateCardType(resolvedCard, options) {
@@ -24,10 +24,10 @@ var updateCardType = function updateCardType(resolvedCard, options) {
     resolvedCard.type = 'inlineCard';
   }
 };
-var handleResolved = function handleResolved(view, request, editorAnalyticsApi, options) {
+var handleResolved = function handleResolved(view, request, editorAnalyticsApi, createAnalyticsEvent, options) {
   return function (resolvedCard) {
     updateCardType(resolvedCard, options);
-    replaceQueuedUrlWithCard(request.url, resolvedCard, request.analyticsAction, editorAnalyticsApi)(view.state, view.dispatch);
+    replaceQueuedUrlWithCard(request.url, resolvedCard, request.analyticsAction, editorAnalyticsApi, createAnalyticsEvent)(view.state, view.dispatch);
     return resolvedCard;
   };
 };

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

@@ -23,6 +23,7 @@ import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from '@atlaskit/editor-common/styles';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
 import { SmallerEditIcon } from './ui/SmallerEditIcon';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 export var removeCard = function removeCard(editorAnalyticsApi) {
   return commandWithMetadata(function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
@@ -162,7 +163,7 @@ var withToolbarMetadata = function withToolbarMetadata(command) {
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.analytics) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
@@ -183,6 +184,9 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     var _ref2 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.decorations) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+    var shouldRenderDatasourceToolbar = isDatasource &&
+    // not showing toolbar in mobile for now since not sure what our plans are for it
+    platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -199,8 +203,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         node: node,
         editorAnalyticsApi: editorAnalyticsApi
       })];
-      // not showing toolbar in mobile for now since not sure what our plans are for it
-    } else if (isDatasource && platform !== 'mobile') {
+    } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
@@ -314,7 +317,7 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, featureFlags
   }] : [];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) {
-  var _node$attrs2;
+  var _node$attrs3;
   var toolbarItems = [{
     id: 'editor.edit.datasource',
     type: 'button',
@@ -324,7 +327,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     title: intl.formatMessage(linkToolbarMessages.editDatasource),
     onClick: editDatasource(editorAnalyticsApi)
   }];
-  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       type: 'separator'
     }, {

package/dist/esm/plugins/collab-edit/analytics.js

@@ -1,7 +1,7 @@
-import { addAnalytics, ACTION, EVENT_TYPE, ACTION_SUBJECT } from '../analytics';
 import { getDocStructure } from '../../utils/document-logger';
 import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
-export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags) {
+import { ACTION, EVENT_TYPE, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
+export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi) {
   return function (error) {
     var browserExtensions = sniffUserBrowserExtensions({
       extensions: ['grammarly']
@@ -20,12 +20,13 @@ export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(stat
         compact: true
       });
     }
-    return addAnalytics(state, tr, payload);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(payload)(tr);
+    return tr;
   };
 };
 export var addSynchronyEntityAnalytics = function addSynchronyEntityAnalytics(state, tr) {
-  return function (type) {
-    return addAnalytics(state, tr, {
+  return function (type, editorAnalyticsApi) {
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
       action: type === 'error' ? ACTION.SYNCHRONY_ENTITY_ERROR : ACTION.SYNCHRONY_DISCONNECTED,
       actionSubject: ACTION_SUBJECT.EDITOR,
       eventType: EVENT_TYPE.OPERATIONAL,
@@ -34,6 +35,7 @@ export var addSynchronyEntityAnalytics = function addSynchronyEntityAnalytics(st
         onLine: navigator.onLine,
         visibilityState: document.visibilityState
       }
-    });
+    })(tr);
+    return tr;
   };
 };

package/dist/esm/plugins/collab-edit/events/handlers.js

@@ -15,14 +15,14 @@ var effect = function effect(fn, eq) {
     return cleanup;
   };
 };
-export var subscribe = effect(function (view, provider, options, featureFlags, _providerFactory) {
+export var subscribe = effect(function (view, provider, options, featureFlags, _providerFactory, editorAnalyticsApi) {
   var entityRef;
   var entityHandlers = {
     disconnectedHandler: function disconnectedHandler() {
-      addSynchronyEntityAnalytics(view.state, view.state.tr)('disconnected');
+      addSynchronyEntityAnalytics(view.state, view.state.tr)('disconnected', editorAnalyticsApi);
     },
     errorHandler: function errorHandler() {
-      addSynchronyEntityAnalytics(view.state, view.state.tr)('error');
+      addSynchronyEntityAnalytics(view.state, view.state.tr)('error', editorAnalyticsApi);
     }
   };
   var unsubscribeSynchronyEntity = function unsubscribeSynchronyEntity() {
@@ -58,7 +58,7 @@ export var subscribe = effect(function (view, provider, options, featureFlags, _
       view.dispatch(tr);
     },
     errorHandler: function errorHandler(error) {
-      addSynchronyErrorAnalytics(view.state, view.state.tr, featureFlags)(error);
+      addSynchronyErrorAnalytics(view.state, view.state.tr, featureFlags, editorAnalyticsApi)(error);
     },
     entityHandler: function entityHandler(_ref) {
       var entity = _ref.entity;

package/dist/esm/plugins/collab-edit/events/initialize.js

@@ -24,14 +24,15 @@ export var initialize = function initialize(_ref) {
   var options = _ref.options,
     providerFactory = _ref.providerFactory,
     view = _ref.view,
-    featureFlags = _ref.featureFlags;
+    featureFlags = _ref.featureFlags,
+    editorAnalyticsApi = _ref.editorAnalyticsApi;
   return function (provider) {
     var cleanup;
     var pluginState = pluginKey.getState(view.state);
     if (pluginState !== null && pluginState !== void 0 && pluginState.isReady && cleanup) {
       cleanup();
     }
-    cleanup = subscribe(view, provider, options, featureFlags, providerFactory);
+    cleanup = subscribe(view, provider, options, featureFlags, providerFactory, editorAnalyticsApi);
 
     // Initialize provider
     if (options.useNativePlugin) {

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

@@ -82,12 +82,13 @@ var collabEditPlugin = function collabEditPlugin(options, api) {
         plugin: function plugin(_ref3) {
           var dispatch = _ref3.dispatch,
             providerFactory = _ref3.providerFactory;
-          return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
+          return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags, api);
         }
       }]);
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {
-      var addErrorAnalytics = addSynchronyErrorAnalytics(props.newEditorState, props.newEditorState.tr, featureFlags);
+      var _api$dependencies$ana;
+      var addErrorAnalytics = addSynchronyErrorAnalytics(props.newEditorState, props.newEditorState.tr, 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);
       executeProviderCode(sendTransaction({
         originalTransaction: props.originalTransaction,
         transactions: props.transactions,

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

@@ -5,8 +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 var createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) {
-  var fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
+export var createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags, pluginInjectionApi) {
   return new SafePlugin({
     key: pluginKey,
     state: {
@@ -40,8 +39,11 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, provi
       return true;
     },
     view: function view(_view) {
-      var addErrorAnalytics = addSynchronyErrorAnalytics(_view.state, _view.state.tr, featureFlags);
+      var _pluginInjectionApi$d, _pluginInjectionApi$d5;
+      var addErrorAnalytics = addSynchronyErrorAnalytics(_view.state, _view.state.tr, featureFlags, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions);
       var onSyncUpError = function onSyncUpError(attributes) {
+        var _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+        var fireAnalyticsCallback = fireAnalyticsEvent((_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.sharedState.currentState()) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.createAnalyticsEvent) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : undefined);
         fireAnalyticsCallback({
           payload: {
             action: ACTION.NEW_COLLAB_SYNC_UP_ERROR_NO_STEPS,
@@ -56,7 +58,8 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, provi
         view: _view,
         options: options,
         providerFactory: providerFactory,
-        featureFlags: featureFlags
+        featureFlags: featureFlags,
+        editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions
       }), addErrorAnalytics);
       providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
         if (providerPromise) {

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

@@ -10,7 +10,7 @@ import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { EmojiTypeAheadItem, SearchSort, recordSelectionSucceededSli, recordSelectionFailedSli } from '@atlaskit/emoji';
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { inputRulePlugin as asciiInputRulePlugin } from './pm-plugins/ascii-input-rules';
-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 { IconEmoji } from '../quick-insert/assets';
 import { EmojiNodeView } from './nodeviews/emoji';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
@@ -60,7 +60,7 @@ var isFullShortName = function isFullShortName(query) {
   return query && query.length > 1 && query.charAt(0) === ':' && query.charAt(query.length - 1) === ':';
 };
 var TRIGGER = ':';
-var emojiPlugin = function emojiPlugin(options) {
+var emojiPlugin = function emojiPlugin(options, api) {
   var typeAhead = {
     id: TypeAheadAvailableNodes.EMOJI,
     trigger: TRIGGER,
@@ -121,6 +121,7 @@ var emojiPlugin = function emojiPlugin(options) {
       return matchedItem;
     },
     selectItem: function selectItem(state, item, insert, _ref5) {
+      var _api$dependencies$ana7;
       var mode = _ref5.mode;
       var _item$emoji = item.emoji,
         _item$emoji$id = _item$emoji.id,
@@ -130,7 +131,12 @@ var emojiPlugin = function emojiPlugin(options) {
       var text = fallback || shortName;
       var emojiPluginState = emojiPluginKey.getState(state);
       if (emojiPluginState.emojiProvider && emojiPluginState.emojiProvider.recordSelection && item.emoji) {
-        emojiPluginState.emojiProvider.recordSelection(item.emoji).then(recordSelectionSucceededSli(options)).catch(recordSelectionFailedSli(options));
+        var _api$dependencies$ana, _api$dependencies$ana2, _api$dependencies$ana3, _api$dependencies$ana4, _api$dependencies$ana5, _api$dependencies$ana6;
+        emojiPluginState.emojiProvider.recordSelection(item.emoji).then(recordSelectionSucceededSli({
+          createAnalyticsEvent: (_api$dependencies$ana = api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : (_api$dependencies$ana3 = _api$dependencies$ana2.sharedState.currentState()) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.createAnalyticsEvent) !== null && _api$dependencies$ana !== void 0 ? _api$dependencies$ana : undefined
+        })).catch(recordSelectionFailedSli({
+          createAnalyticsEvent: (_api$dependencies$ana4 = api === null || api === void 0 ? void 0 : (_api$dependencies$ana5 = api.dependencies.analytics) === null || _api$dependencies$ana5 === void 0 ? void 0 : (_api$dependencies$ana6 = _api$dependencies$ana5.sharedState.currentState()) === null || _api$dependencies$ana6 === void 0 ? void 0 : _api$dependencies$ana6.createAnalyticsEvent) !== null && _api$dependencies$ana4 !== void 0 ? _api$dependencies$ana4 : undefined
+        }));
       }
       var emojiNode = state.schema.nodes.emoji.createChecked({
         shortName: shortName,
@@ -138,7 +144,8 @@ var emojiPlugin = function emojiPlugin(options) {
         text: text
       });
       var space = state.schema.text(' ');
-      return addAnalytics(state, insert(Fragment.from([emojiNode, space])), {
+      var tr = insert(Fragment.from([emojiNode, space]));
+      api === null || api === void 0 ? void 0 : (_api$dependencies$ana7 = api.dependencies.analytics) === null || _api$dependencies$ana7 === void 0 ? void 0 : _api$dependencies$ana7.actions.attachAnalyticsEvent({
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.EMOJI,
@@ -146,7 +153,8 @@ var emojiPlugin = function emojiPlugin(options) {
           inputMethod: INPUT_METHOD.TYPEAHEAD
         },
         eventType: EVENT_TYPE.TRACK
-      });
+      })(tr);
+      return tr;
     }
   };
   return {
@@ -186,12 +194,13 @@ var emojiPlugin = function emojiPlugin(options) {
             return /*#__PURE__*/React.createElement(IconEmoji, null);
           },
           action: function action(insert, state) {
+            var _api$dependencies$ana8;
             var tr = insert(undefined);
             openTypeAheadAtCursor({
               triggerHandler: typeAhead,
               inputMethod: INPUT_METHOD.QUICK_INSERT
             })(tr);
-            return addAnalytics(state, tr, {
+            api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions.attachAnalyticsEvent({
               action: ACTION.INVOKED,
               actionSubject: ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_EMOJI,
@@ -199,7 +208,8 @@ var emojiPlugin = function emojiPlugin(options) {
                 inputMethod: INPUT_METHOD.QUICK_INSERT
               },
               eventType: EVENT_TYPE.UI
-            });
+            })(tr);
+            return tr;
           }
         }];
       },