@atlaskit/editor-core 185.13.0 → 185.14.0

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

@@ -15,6 +15,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 const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryParams => {
   const {
     lpAnalyticsEventsNext
@@ -26,9 +27,16 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     allowResizing,
     useAlternativePreloader,
     fullWidthMode,
-    createAnalyticsEvent,
     showServerActions
   } = options;
+  const inlineCardViewProducer = getInlineNodeViewProducer({
+    pmPluginFactoryParams,
+    Component: InlineCardNodeView,
+    extraComponentProps: {
+      useAlternativePreloader,
+      showServerActions
+    }
+  });
   return new SafePlugin({
     state: {
       init() {
@@ -39,7 +47,6 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           showLinkingToolbar: false,
           smartLinkEvents: undefined,
           smartLinkEventsNext: undefined,
-          createAnalyticsEvent,
           editorAppearance,
           showDatasourceModal: false,
           datasourceTableRef: undefined,
@@ -127,8 +134,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
                * other tasks as per common implementations of the JavaScript event loop in browsers.
                */
               const invoke = rafSchedule(() => {
-                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();
@@ -145,15 +152,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     },
     props: {
       nodeViews: {
-        inlineCard: getInlineNodeViewProducer({
-          pmPluginFactoryParams,
-          Component: InlineCardNodeView,
-          extraComponentProps: {
-            useAlternativePreloader,
-            showServerActions
-          }
-        }),
-        blockCard: (node, view, getPos) => {
+        inlineCard: inlineCardViewProducer,
+        blockCard: (node, view, getPos, decorations) => {
           var _node$attrs3;
           const {
             portalProviderAPI,
@@ -166,15 +166,20 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           const hasIntlContext = true;
           const isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
           if (isDatasource) {
-            return new Datasource({
-              node,
-              view,
-              getPos,
-              portalProviderAPI,
-              eventDispatcher,
-              hasIntlContext,
-              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,
+                view,
+                getPos,
+                portalProviderAPI,
+                eventDispatcher,
+                hasIntlContext,
+                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/es2019/plugins/card/pm-plugins/util/resolve.js

@@ -5,14 +5,14 @@ import { replaceQueuedUrlWithCard, handleFallbackWithAnalytics } from '../doc';
 // ============================================================================ //
 // Used for all interactions with the EditorCardProvider.
 // ============================================================================ //
-export const resolveWithProvider = (view, provider, request, options, editorAnalyticsApi) => {
+export const resolveWithProvider = (view, provider, request, options, editorAnalyticsApi, createAnalyticsEvent) => {
   // When user manually changes appearance from blue link to smart link, we should respect that,
   let 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;
-  const handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, editorAnalyticsApi, options), handleRejected(view, request, editorAnalyticsApi));
+  const handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, editorAnalyticsApi, createAnalyticsEvent, options), handleRejected(view, request, editorAnalyticsApi));
   return handleResolve;
 };
 const updateCardType = (resolvedCard, options) => {
@@ -24,9 +24,9 @@ const updateCardType = (resolvedCard, options) => {
     resolvedCard.type = 'inlineCard';
   }
 };
-const handleResolved = (view, request, editorAnalyticsApi, options) => resolvedCard => {
+const handleResolved = (view, request, editorAnalyticsApi, createAnalyticsEvent, options) => 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;
 };
 const handleRejected = (view, request, editorAnalyticsApi) => () => {

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

@@ -19,6 +19,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 const removeCard = editorAnalyticsApi => commandWithMetadata((state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -164,7 +165,7 @@ const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB
 });
 const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) => 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;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -189,6 +190,9 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
     hoverDecoration
   } = (_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 : {};
   const isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+  const 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') {
@@ -205,8 +209,7 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       node,
       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 {
     const {
@@ -323,7 +326,7 @@ const getSettingsButtonGroup = (state, featureFlags, intl, editorAnalyticsApi) =
   }] : [];
 };
 const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) => {
-  var _node$attrs2;
+  var _node$attrs3;
   const toolbarItems = [{
     id: 'editor.edit.datasource',
     type: 'button',
@@ -333,7 +336,7 @@ const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, nod
     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/es2019/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 const addSynchronyErrorAnalytics = (state, tr, featureFlags) => {
+import { ACTION, EVENT_TYPE, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
+export const addSynchronyErrorAnalytics = (state, tr, featureFlags, editorAnalyticsApi) => {
   return error => {
     const browserExtensions = sniffUserBrowserExtensions({
       extensions: ['grammarly']
@@ -20,18 +20,22 @@ export const addSynchronyErrorAnalytics = (state, tr, featureFlags) => {
         compact: true
       });
     }
-    return addAnalytics(state, tr, payload);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(payload)(tr);
+    return tr;
   };
 };
 export const addSynchronyEntityAnalytics = (state, tr) => {
-  return type => addAnalytics(state, tr, {
-    action: type === 'error' ? ACTION.SYNCHRONY_ENTITY_ERROR : ACTION.SYNCHRONY_DISCONNECTED,
-    actionSubject: ACTION_SUBJECT.EDITOR,
-    eventType: EVENT_TYPE.OPERATIONAL,
-    attributes: {
-      // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorOnLine/onLine
-      onLine: navigator.onLine,
-      visibilityState: document.visibilityState
-    }
-  });
+  return (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,
+      attributes: {
+        // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorOnLine/onLine
+        onLine: navigator.onLine,
+        visibilityState: document.visibilityState
+      }
+    })(tr);
+    return tr;
+  };
 };

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

@@ -12,14 +12,14 @@ const effect = (fn, eq) => {
     return cleanup;
   };
 };
-export const subscribe = effect((view, provider, options, featureFlags, _providerFactory) => {
+export const subscribe = effect((view, provider, options, featureFlags, _providerFactory, editorAnalyticsApi) => {
   let entityRef;
   const entityHandlers = {
     disconnectedHandler: () => {
-      addSynchronyEntityAnalytics(view.state, view.state.tr)('disconnected');
+      addSynchronyEntityAnalytics(view.state, view.state.tr)('disconnected', editorAnalyticsApi);
     },
     errorHandler: () => {
-      addSynchronyEntityAnalytics(view.state, view.state.tr)('error');
+      addSynchronyEntityAnalytics(view.state, view.state.tr)('error', editorAnalyticsApi);
     }
   };
   const unsubscribeSynchronyEntity = () => {
@@ -51,7 +51,7 @@ export const subscribe = effect((view, provider, options, featureFlags, _provide
       view.dispatch(tr);
     },
     errorHandler: error => {
-      addSynchronyErrorAnalytics(view.state, view.state.tr, featureFlags)(error);
+      addSynchronyErrorAnalytics(view.state, view.state.tr, featureFlags, editorAnalyticsApi)(error);
     },
     entityHandler: ({
       entity

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

@@ -18,14 +18,15 @@ export const initialize = ({
   options,
   providerFactory,
   view,
-  featureFlags
+  featureFlags,
+  editorAnalyticsApi
 }) => provider => {
   let cleanup;
   const 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/es2019/plugins/collab-edit/index.js

@@ -50,12 +50,13 @@ const collabEditPlugin = (options, api) => {
           dispatch,
           providerFactory
         }) => {
-          return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
+          return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags, api);
         }
       }];
     },
     onEditorViewStateUpdated(props) {
-      const addErrorAnalytics = addSynchronyErrorAnalytics(props.newEditorState, props.newEditorState.tr, featureFlags);
+      var _api$dependencies$ana;
+      const 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/es2019/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 const createPlugin = (dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) => {
-  const fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
+export const createPlugin = (dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags, pluginInjectionApi) => {
   return new SafePlugin({
     key: pluginKey,
     state: {
@@ -40,8 +39,11 @@ export const createPlugin = (dispatch, providerFactory, providerResolver, collab
       return true;
     },
     view(view) {
-      const addErrorAnalytics = addSynchronyErrorAnalytics(view.state, view.state.tr, featureFlags);
+      var _pluginInjectionApi$d, _pluginInjectionApi$d5;
+      const 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);
       const onSyncUpError = attributes => {
+        var _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+        const 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 const createPlugin = (dispatch, providerFactory, providerResolver, collab
         view,
         options,
         providerFactory,
-        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', (_name, providerPromise) => {
         if (providerPromise) {

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

@@ -7,7 +7,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';
@@ -54,7 +54,7 @@ const memoizedToItem = memoize(emojiToTypeaheadItem);
 export const defaultListLimit = 50;
 const isFullShortName = query => query && query.length > 1 && query.charAt(0) === ':' && query.charAt(query.length - 1) === ':';
 const TRIGGER = ':';
-const emojiPlugin = options => {
+const emojiPlugin = (options, api) => {
   const typeAhead = {
     id: TypeAheadAvailableNodes.EMOJI,
     trigger: TRIGGER,
@@ -116,6 +116,7 @@ const emojiPlugin = options => {
     selectItem(state, item, insert, {
       mode
     }) {
+      var _api$dependencies$ana7;
       const {
         id = '',
         fallback,
@@ -124,7 +125,12 @@ const emojiPlugin = options => {
       const text = fallback || shortName;
       const 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
+        }));
       }
       const emojiNode = state.schema.nodes.emoji.createChecked({
         shortName,
@@ -132,7 +138,8 @@ const emojiPlugin = options => {
         text
       });
       const space = state.schema.text(' ');
-      return addAnalytics(state, insert(Fragment.from([emojiNode, space])), {
+      const 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,
@@ -140,7 +147,8 @@ const emojiPlugin = options => {
           inputMethod: INPUT_METHOD.TYPEAHEAD
         },
         eventType: EVENT_TYPE.TRACK
-      });
+      })(tr);
+      return tr;
     }
   };
   return {
@@ -175,12 +183,13 @@ const emojiPlugin = options => {
         keyshortcut: ':',
         icon: () => /*#__PURE__*/React.createElement(IconEmoji, null),
         action(insert, state) {
+          var _api$dependencies$ana8;
           const 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,
@@ -188,7 +197,8 @@ const emojiPlugin = options => {
               inputMethod: INPUT_METHOD.QUICK_INSERT
             },
             eventType: EVENT_TYPE.UI
-          });
+          })(tr);
+          return tr;
         }
       }],
       typeAhead

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

@@ -16,12 +16,13 @@ export { mentionPluginKey };
 const mentionsPlugin = (options, api) => {
   let sessionId = uuid();
   const fireEvent = payload => {
-    if (!(options !== null && options !== void 0 && options.createAnalyticsEvent)) {
-      return;
-    }
+    var _api$dependencies$ana, _api$dependencies$ana2;
     const {
       createAnalyticsEvent
-    } = options;
+    } = (_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$ana2.sharedState.currentState()) !== null && _api$dependencies$ana !== void 0 ? _api$dependencies$ana : {};
+    if (!createAnalyticsEvent) {
+      return;
+    }
     if (payload.attributes && !payload.attributes.sessionId) {
       payload.attributes.sessionId = sessionId;
     }
@@ -76,13 +77,13 @@ const mentionsPlugin = (options, api) => {
         keyshortcut: '@',
         icon: () => /*#__PURE__*/React.createElement(IconMention, null),
         action(insert, state) {
-          var _api$dependencies$ana;
+          var _api$dependencies$ana3;
           const tr = insert(undefined);
           openTypeAheadAtCursor({
             triggerHandler: typeAhead,
             inputMethod: INPUT_METHOD.QUICK_INSERT
           })(tr);
-          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.attachAnalyticsEvent({
+          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.attachAnalyticsEvent({
             action: ACTION.INVOKED,
             actionSubject: ACTION_SUBJECT.TYPEAHEAD,
             actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_MENTION,

package/dist/es2019/version-wrapper.js

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

package/dist/esm/create-editor/create-plugins-list.js

@@ -107,8 +107,8 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
  * Note: The order that presets are added determines
  * their placement in the editor toolbar
  */
-export default function createPluginsList(props, prevProps, createAnalyticsEvent) {
-  var preset = createUniversalPreset(props.appearance, getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent), createFeatureFlagsFromProps(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance, createAnalyticsEvent);
+export default function createPluginsList(props, prevProps) {
+  var preset = createUniversalPreset(props.appearance, getDefaultPresetOptionsFromEditorProps(props), createFeatureFlagsFromProps(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance);
   var excludes = new Set();
   if (!isCodeBlockAllowed({
     allowBlockType: props.allowBlockType
@@ -138,8 +138,8 @@ function withDangerouslyAppendPlugins(preset) {
     return presetWithAppendedPlugins;
   };
 }
-export function createPreset(props, prevProps, createAnalyticsEvent) {
+export function createPreset(props, prevProps) {
   var _props$dangerouslyApp;
-  var preset = createUniversalPreset(props.appearance, getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent), createFeatureFlagsFromProps(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance, createAnalyticsEvent);
+  var preset = createUniversalPreset(props.appearance, getDefaultPresetOptionsFromEditorProps(props), createFeatureFlagsFromProps(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance);
   return withDangerouslyAppendPlugins(preset)((_props$dangerouslyApp = props.dangerouslyAppendPlugins) === null || _props$dangerouslyApp === void 0 ? void 0 : _props$dangerouslyApp.__plugins);
 }

package/dist/esm/editor-next/index.js

@@ -12,14 +12,13 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /** @jsx jsx */
 
 import { WithCreateAnalyticsEvent } from '@atlaskit/editor-common/ui';
-// import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
+import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import React from 'react';
-// import { name, version } from '../version-wrapper';
-
-// import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-// import uuid from 'uuid/v4';
+import { name, version } from '../version-wrapper';
+import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
+import uuid from 'uuid/v4';
 import EditorActions from '../actions';
 import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import EditorInternal from './editor-internal';
@@ -32,8 +31,6 @@ import { basePlugin } from '../plugins';
 var EditorNext = /*#__PURE__*/function (_React$Component) {
   _inherits(EditorNext, _React$Component);
   var _super = _createSuper(EditorNext);
-  // private editorSessionId: string;
-
   function EditorNext(props, context) {
     var _this;
     _classCallCheck(this, EditorNext);
@@ -53,7 +50,7 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     });
     deprecationWarnings(props);
     _this.editorActions = (context || {}).editorActions || new EditorActions();
-    // this.editorSessionId = uuid();
+    _this.editorSessionId = uuid();
     _this.startTime = performance.now();
     _this.onEditorCreated = _this.onEditorCreated.bind(_assertThisInitialized(_this));
     _this.onEditorDestroyed = _this.onEditorDestroyed.bind(_assertThisInitialized(_this));
@@ -96,40 +93,29 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this3 = this;
-      // TODO: https://product-fabric.atlassian.net/browse/ED-16979
-      // Move `FabricEditorAnalyticsContext` back into `EditorNext`
-      // This was moved out here to workaround the issue that the analytics
-      // context does not wrap the Preset (and therefore does not pass this context
-      // information to analytics calls within plugins). After this cleanup task ^ we will
-      // not have to generate the `createAnalyticsEvent` outside the Preset
-      // and we can move this back into `EditorNext`.
-      return (
-        // <FabricEditorAnalyticsContext
-        //   data={{
-        //     packageName: name,
-        //     packageVersion: version,
-        //     componentName: 'editorCore',
-        //     appearance: getAnalyticsAppearance(this.props.appearance),
-        //     editorSessionId: this.editorSessionId,
-        //   }}
-        // >
-        jsx(WithCreateAnalyticsEvent, {
-          render: function render(createAnalyticsEvent) {
-            return (_this3.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-              props: _this3.props,
-              handleAnalyticsEvent: _this3.handleAnalyticsEvent,
-              createAnalyticsEvent: _this3.createAnalyticsEvent,
-              preset: _this3.props.preset,
-              handleSave: _this3.handleSave,
-              editorActions: _this3.editorActions,
-              getExperienceStore: _this3.getExperienceStore,
-              onEditorCreated: _this3.onEditorCreated,
-              onEditorDestroyed: _this3.onEditorDestroyed
-            });
-          }
-        })
-        // </FabricEditorAnalyticsContext>
-      );
+      return jsx(FabricEditorAnalyticsContext, {
+        data: {
+          packageName: name,
+          packageVersion: version,
+          componentName: 'editorCore',
+          appearance: getAnalyticsAppearance(this.props.appearance),
+          editorSessionId: this.editorSessionId
+        }
+      }, jsx(WithCreateAnalyticsEvent, {
+        render: function render(createAnalyticsEvent) {
+          return (_this3.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
+            props: _this3.props,
+            handleAnalyticsEvent: _this3.handleAnalyticsEvent,
+            createAnalyticsEvent: _this3.createAnalyticsEvent,
+            preset: _this3.props.preset,
+            handleSave: _this3.handleSave,
+            editorActions: _this3.editorActions,
+            getExperienceStore: _this3.getExperienceStore,
+            onEditorCreated: _this3.onEditorCreated,
+            onEditorDestroyed: _this3.onEditorDestroyed
+          });
+        }
+      }));
     }
   }]);
   return EditorNext;

package/dist/esm/editor.js

@@ -1,6 +1,5 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
@@ -14,10 +13,6 @@ import React from 'react';
 import { defaultProps } from './editor-next/utils/editorPropTypes';
 import EditorNext from './editor-next';
 import useUniversalPreset from './labs/next/presets/useUniversalPreset';
-import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { name, version } from './version-wrapper';
-import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
-import uuid from 'uuid/v4';
 var EditorNextWrapper = function EditorNextWrapper(_ref) {
   var props = _ref.props;
   var preset = useUniversalPreset({
@@ -31,36 +26,15 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   _inherits(Editor, _React$Component);
   var _super = _createSuper(Editor);
   function Editor() {
-    var _this;
     _classCallCheck(this, Editor);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "editorSessionId", uuid());
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(Editor, [{
     key: "render",
     value: function render() {
-      // TODO: https://product-fabric.atlassian.net/browse/ED-16979
-      // Move `FabricEditorAnalyticsContext` back into `EditorNext`
-      // This was moved out here to workaround the issue that the analytics
-      // context does not wrap the Preset (and therefore does not pass this context
-      // information to analytics calls within plugins). After this cleanup task ^ we will
-      // not have to generate the `createAnalyticsEvent` outside the Preset
-      // and we can move this back into `EditorNext`.
-      return jsx(FabricEditorAnalyticsContext, {
-        data: {
-          packageName: name,
-          packageVersion: version,
-          componentName: 'editorCore',
-          appearance: getAnalyticsAppearance(this.props.appearance),
-          editorSessionId: this.editorSessionId
-        }
-      }, jsx(EditorNextWrapper, {
+      return jsx(EditorNextWrapper, {
         props: this.props
-      }));
+      });
     }
   }]);
   return Editor;