@atlaskit/editor-core 185.13.1 → 185.14.2

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

@@ -20,7 +20,7 @@ var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _emoji2 = require("@atlaskit/emoji");
 var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _asciiInputRules = require("./pm-plugins/ascii-input-rules");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _assets = require("../quick-insert/assets");
 var _emoji3 = require("./nodeviews/emoji");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
@@ -74,7 +74,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: _typeAhead.TypeAheadAvailableNodes.EMOJI,
     trigger: TRIGGER,
@@ -135,6 +135,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,
@@ -144,7 +145,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((0, _emoji2.recordSelectionSucceededSli)(options)).catch((0, _emoji2.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((0, _emoji2.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((0, _emoji2.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,
@@ -152,7 +158,8 @@ var emojiPlugin = function emojiPlugin(options) {
         text: text
       });
       var space = state.schema.text(' ');
-      return (0, _analytics.addAnalytics)(state, insert(_prosemirrorModel.Fragment.from([emojiNode, space])), {
+      var tr = insert(_prosemirrorModel.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: _analytics.ACTION.INSERTED,
         actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.EMOJI,
@@ -160,7 +167,8 @@ var emojiPlugin = function emojiPlugin(options) {
           inputMethod: _analytics.INPUT_METHOD.TYPEAHEAD
         },
         eventType: _analytics.EVENT_TYPE.TRACK
-      });
+      })(tr);
+      return tr;
     }
   };
   return {
@@ -200,12 +208,13 @@ var emojiPlugin = function emojiPlugin(options) {
             return /*#__PURE__*/_react.default.createElement(_assets.IconEmoji, null);
           },
           action: function action(insert, state) {
+            var _api$dependencies$ana8;
             var tr = insert(undefined);
             (0, _openTypeaheadAtCursor.openTypeAheadAtCursor)({
               triggerHandler: typeAhead,
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
             })(tr);
-            return (0, _analytics.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: _analytics.ACTION.INVOKED,
               actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_EMOJI,
@@ -213,7 +222,8 @@ var emojiPlugin = function emojiPlugin(options) {
                 inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
               },
               eventType: _analytics.EVENT_TYPE.UI
-            });
+            })(tr);
+            return tr;
           }
         }];
       },

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

@@ -28,10 +28,12 @@ var _main = require("./pm-plugins/main");
 var mentionsPlugin = function mentionsPlugin(options, api) {
   var sessionId = (0, _uuid.default)();
   var fireEvent = function fireEvent(payload) {
-    if (!(options !== null && options !== void 0 && options.createAnalyticsEvent)) {
+    var _api$dependencies$ana, _api$dependencies$ana2;
+    var _ref = (_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 : {},
+      createAnalyticsEvent = _ref.createAnalyticsEvent;
+    if (!createAnalyticsEvent) {
       return;
     }
-    var createAnalyticsEvent = options.createAnalyticsEvent;
     if (payload.attributes && !payload.attributes.sessionId) {
       payload.attributes.sessionId = sessionId;
     }
@@ -59,17 +61,17 @@ var mentionsPlugin = function mentionsPlugin(options, api) {
         }
       }];
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref) {
-      var editorView = _ref.editorView,
-        disabled = _ref.disabled;
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref2) {
+      var editorView = _ref2.editorView,
+        disabled = _ref2.disabled;
       return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
         editorView: editorView,
         plugins: {
           mentionState: _key.mentionPluginKey
         },
-        render: function render(_ref2) {
-          var _ref2$mentionState = _ref2.mentionState,
-            mentionState = _ref2$mentionState === void 0 ? {} : _ref2$mentionState;
+        render: function render(_ref3) {
+          var _ref3$mentionState = _ref3.mentionState,
+            mentionState = _ref3$mentionState === void 0 ? {} : _ref3$mentionState;
           return !mentionState.mentionProvider ? null : /*#__PURE__*/_react.default.createElement(_ToolbarMention.default, {
             editorView: editorView,
             isDisabled: disabled || (0, _utils.isTypeAheadAllowed)(editorView.state)
@@ -78,8 +80,8 @@ var mentionsPlugin = function mentionsPlugin(options, api) {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref3) {
-        var formatMessage = _ref3.formatMessage;
+      quickInsert: function quickInsert(_ref4) {
+        var formatMessage = _ref4.formatMessage;
         return [{
           id: 'mention',
           title: formatMessage(_messages.messages.mention),
@@ -91,13 +93,13 @@ var mentionsPlugin = function mentionsPlugin(options, api) {
             return /*#__PURE__*/_react.default.createElement(_assets.IconMention, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana;
+            var _api$dependencies$ana3;
             var tr = insert(undefined);
             (0, _openTypeaheadAtCursor.openTypeAheadAtCursor)({
               triggerHandler: typeAhead,
               inputMethod: _analytics.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: _analytics.ACTION.INVOKED,
               actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_MENTION,

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

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

@@ -105,8 +105,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) {
-  const 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) {
+  const preset = createUniversalPreset(props.appearance, getDefaultPresetOptionsFromEditorProps(props), createFeatureFlagsFromProps(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance);
   const excludes = new Set();
   if (!isCodeBlockAllowed({
     allowBlockType: props.allowBlockType
@@ -132,8 +132,8 @@ function withDangerouslyAppendPlugins(preset) {
     return presetWithAppendedPlugins;
   };
 }
-export function createPreset(props, prevProps, createAnalyticsEvent) {
+export function createPreset(props, prevProps) {
   var _props$dangerouslyApp;
-  const preset = createUniversalPreset(props.appearance, getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent), createFeatureFlagsFromProps(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance, createAnalyticsEvent);
+  const 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/es2019/editor-next/index.js

@@ -2,14 +2,13 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /** @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';
@@ -20,8 +19,6 @@ import deprecationWarnings from './utils/deprecationWarnings';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import { basePlugin } from '../plugins';
 export default class EditorNext extends React.Component {
-  // private editorSessionId: string;
-
   constructor(props, context) {
     super(props);
     _defineProperty(this, "handleSave", view => {
@@ -35,7 +32,7 @@ export default class EditorNext extends React.Component {
     _defineProperty(this, "getExperienceStore", () => this.experienceStore);
     deprecationWarnings(props);
     this.editorActions = (context || {}).editorActions || new EditorActions();
-    // this.editorSessionId = uuid();
+    this.editorSessionId = uuid();
     this.startTime = performance.now();
     this.onEditorCreated = this.onEditorCreated.bind(this);
     this.onEditorDestroyed = this.onEditorDestroyed.bind(this);
@@ -57,38 +54,27 @@ export default class EditorNext extends React.Component {
     this.editorActions._privateUnregisterEditor();
   }
   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 (
-      // <FabricEditorAnalyticsContext
-      //   data={{
-      //     packageName: name,
-      //     packageVersion: version,
-      //     componentName: 'editorCore',
-      //     appearance: getAnalyticsAppearance(this.props.appearance),
-      //     editorSessionId: this.editorSessionId,
-      //   }}
-      // >
-      jsx(WithCreateAnalyticsEvent, {
-        render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-          props: this.props,
-          handleAnalyticsEvent: this.handleAnalyticsEvent,
-          createAnalyticsEvent: this.createAnalyticsEvent,
-          preset: this.props.preset,
-          handleSave: this.handleSave,
-          editorActions: this.editorActions,
-          getExperienceStore: this.getExperienceStore,
-          onEditorCreated: this.onEditorCreated,
-          onEditorDestroyed: this.onEditorDestroyed
-        })
+    return jsx(FabricEditorAnalyticsContext, {
+      data: {
+        packageName: name,
+        packageVersion: version,
+        componentName: 'editorCore',
+        appearance: getAnalyticsAppearance(this.props.appearance),
+        editorSessionId: this.editorSessionId
+      }
+    }, jsx(WithCreateAnalyticsEvent, {
+      render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
+        props: this.props,
+        handleAnalyticsEvent: this.handleAnalyticsEvent,
+        createAnalyticsEvent: this.createAnalyticsEvent,
+        preset: this.props.preset,
+        handleSave: this.handleSave,
+        editorActions: this.editorActions,
+        getExperienceStore: this.getExperienceStore,
+        onEditorCreated: this.onEditorCreated,
+        onEditorDestroyed: this.onEditorDestroyed
       })
-      // </FabricEditorAnalyticsContext>
-    );
+    }));
   }
 }
 _defineProperty(EditorNext, "defaultProps", {

package/dist/es2019/editor.js

@@ -6,10 +6,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';
 const EditorNextWrapper = ({
   props
 }) => {
@@ -21,29 +17,10 @@ const EditorNextWrapper = ({
   }, props));
 };
 export default class Editor extends React.Component {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "editorSessionId", uuid());
-  }
   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
-    }));
+    });
   }
 }
 _defineProperty(Editor, "defaultProps", defaultProps);

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

@@ -1,3 +1,4 @@
+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';
@@ -8,7 +9,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)
@@ -20,17 +20,12 @@ 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) {
   const isMobile = appearance === 'mobile';
   const isComment = appearance === 'comment';
   const isFullPage = fullPageCheck(appearance);
   const getEditorFeatureFlags = () => featureFlags;
-  const stubs = createStubInternalApis();
-  const {
-    editorSelectionAPI,
-    stubInternalApisPlugin
-  } = stubs;
-  const createAnalyticsEvent = maybeCreateAnalyticsEvent ? maybeCreateAnalyticsEvent : stubs.createAnalyticsEvent;
+  const editorSelectionAPI = createEditorSelectionAPI();
   const defaultPreset = createDefaultPreset({
     ...props,
     createAnalyticsEvent
@@ -42,7 +37,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     }
     return false;
   };
-  const finalPreset = defaultPreset.add(stubInternalApisPlugin).add(dataConsumerMarkPlugin).add(contentInsertionPlugin).maybeAdd(breakoutPlugin, (plugin, builder) => {
+  const finalPreset = defaultPreset.add(dataConsumerMarkPlugin).add(contentInsertionPlugin).maybeAdd(breakoutPlugin, (plugin, builder) => {
     if (props.allowBreakout && isFullPage) {
       return builder.add([plugin, {
         allowBreakoutButton: appearance === 'full-page'
@@ -119,7 +114,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,
         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,
@@ -129,9 +123,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     return builder;
   }).maybeAdd(emojiPlugin, (plugin, builder) => {
     if (props.emojiProvider) {
-      return builder.add([plugin, {
-        createAnalyticsEvent
-      }]);
+      return builder.add(plugin);
     }
     return builder;
   }).maybeAdd(tablesPlugin, (plugin, builder) => {
@@ -193,8 +185,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     if (props.collabEdit || props.collabEditProvider) {
       var _collabEditOptions$EX;
       let collabEditOptions = {
-        sanitizePrivateContent: props.sanitizePrivateContent,
-        createAnalyticsEvent
+        sanitizePrivateContent: props.sanitizePrivateContent
       };
       if (props.collabEdit) {
         collabEditOptions = {
@@ -291,7 +282,6 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
         ...((_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.smartLinks),
         platform: isMobile ? 'mobile' : 'web',
         fullWidthMode,
-        createAnalyticsEvent,
         linkPicker: (_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.linkPicker,
         editorAppearance: appearance
       }]);

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

@@ -1,14 +1,10 @@
 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({
   props
 }) {
-  const {
-    createAnalyticsEvent
-  } = useAnalyticsEvents();
   const previousEditorProps = usePreviousState(props);
   const [preset, setPreset] = useState(() => createPreset(props, previousEditorProps));
   useLayoutEffect(() => {
@@ -19,7 +15,7 @@ export default function useUniversalPreset({
     if (!recreate) {
       return;
     }
-    setPreset(createPreset(props, previousEditorProps, createAnalyticsEvent));
-  }, [props, previousEditorProps, createAnalyticsEvent]);
+    setPreset(createPreset(props, previousEditorProps));
+  }, [props, previousEditorProps]);
   return preset;
 }

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

@@ -3,27 +3,34 @@ 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;
   }
   const hasRequiredPerformanceAPIs = isPerformanceAPIAvailable();
+  const 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: () => {
+        var _pluginInjectionApi$d3;
         return {
           ...options,
+          createAnalyticsEvent: getCreateAnalyticsEvent(),
           fireAnalytics: fireAnalyticsEvent(options.createAnalyticsEvent),
-          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: (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 {
             ...pluginState,
-            createAnalyticsEvent: options.createAnalyticsEvent
+            createAnalyticsEvent: (_options$createAnalyt = options.createAnalyticsEvent) !== null && _options$createAnalyt !== void 0 ? _options$createAnalyt : getCreateAnalyticsEvent()
           };
         }
         if (featureFlags.catchAllTracking) {
@@ -78,10 +85,7 @@ const analyticsPlugin = (options, api) => {
     pmPlugins() {
       return [{
         name: 'analyticsPlugin',
-        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);
-        }
+        plugin: () => createPlugin(options, featureFlags, api)
       }];
     }
   };

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

@@ -10,7 +10,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 const replaceQueuedUrlWithCard = (url, cardData, analyticsAction, editorAnalyticsApi) => (editorState, dispatch) => {
+export const replaceQueuedUrlWithCard = (url, cardData, analyticsAction, editorAnalyticsApi, createAnalyticsEvent) => (editorState, dispatch) => {
   const state = pluginKey.getState(editorState);
   if (!state) {
     return false;
@@ -70,7 +69,7 @@ export const replaceQueuedUrlWithCard = (url, cardData, analyticsAction, editorA
       const nodeType = 'inlineCard';
       const [,, domainName] = url.split('/');
       if (state.smartLinkEvents) {
-        state.smartLinkEvents.insertSmartLink(domainName, 'inline', state.createAnalyticsEvent);
+        state.smartLinkEvents.insertSmartLink(domainName, 'inline', createAnalyticsEvent);
       }
 
       /**

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

@@ -27,7 +27,6 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     allowResizing,
     useAlternativePreloader,
     fullWidthMode,
-    createAnalyticsEvent,
     showServerActions
   } = options;
   const inlineCardViewProducer = getInlineNodeViewProducer({
@@ -48,7 +47,6 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           showLinkingToolbar: false,
           smartLinkEvents: undefined,
           smartLinkEventsNext: undefined,
-          createAnalyticsEvent,
           editorAppearance,
           showDatasourceModal: false,
           datasourceTableRef: undefined,
@@ -136,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();

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/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;
+  };
 };