@atlaskit/editor-core 189.3.17 → 189.3.19

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 189.3.19
+
+### Patch Changes
+
+- [#43099](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43099) [`743652a9a4a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/743652a9a4a) - Remove deprecated internal analytics plugin.
+- Updated dependencies
+
+## 189.3.18
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 189.3.17
 
 ### Patch Changes

package/dist/cjs/plugins/avatar-group/index.js

@@ -15,6 +15,7 @@ var avatarGroup = function avatarGroup(_ref) {
   return {
     name: 'avatarGroup',
     primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
+      var _api$analytics;
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,
         popupsBoundariesElement = _ref2.popupsBoundariesElement,
@@ -29,7 +30,8 @@ var avatarGroup = function avatarGroup(_ref) {
         eventDispatcher: eventDispatcher,
         collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
         takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-        featureFlags: featureFlags
+        featureFlags: featureFlags,
+        editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
       });
     }
   };

package/dist/cjs/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -41,7 +41,8 @@ var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
     inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,
     inviteToEditHandler: props.collabEdit && props.collabEdit.inviteToEditHandler,
     isInviteToEditButtonSelected: props.collabEdit && props.collabEdit.isInviteToEditButtonSelected,
-    featureFlags: featureFlags
+    featureFlags: featureFlags,
+    editorAnalyticsAPI: props.editorAnalyticsAPI
   }));
 };
 var _default = exports.default = AvatarGroupPluginWrapper;

package/dist/cjs/plugins/collab-edit/ui/avatars-with-plugin-state.js

@@ -18,7 +18,8 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
     onClick = props.inviteToEditHandler,
     Component = props.inviteToEditComponent,
     editorView = props.editorView,
-    featureFlags = props.featureFlags;
+    featureFlags = props.featureFlags,
+    editorAnalyticsAPI = props.editorAnalyticsAPI;
   var render = _react.default.useCallback(function (_ref) {
     var data = _ref.data;
     if (!data) {
@@ -28,14 +29,15 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
       sessionId: data.sessionId,
       participants: data.activeParticipants,
       editorView: editorView,
-      featureFlags: featureFlags
+      featureFlags: featureFlags,
+      editorAnalyticsAPI: editorAnalyticsAPI
     }, /*#__PURE__*/_react.default.createElement(_inviteToEdit.InviteToEditButton, {
       title: title,
       selected: selected,
       onClick: onClick,
       Component: Component
     }));
-  }, [selected, onClick, Component, title, editorView, featureFlags]);
+  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI]);
   return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
     plugins: {
       data: _plugin.pluginKey

package/dist/cjs/plugins/collab-edit/ui/avatars.js

@@ -39,7 +39,7 @@ var Avatars = exports.Avatars = /*#__PURE__*/_react.default.memo(function (props
 
       // user does not need to scroll to their own position (index 0)
       if (allowCollabAvatarScroll && index > 0) {
-        (0, _utils.scrollToCollabCursor)(editorView, participants, props.sessionId, index);
+        (0, _utils.scrollToCollabCursor)(editorView, participants, props.sessionId, index, props.editorAnalyticsAPI);
       }
     }
   }), props.children);

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

@@ -12,7 +12,6 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var themeColors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _utils = require("@atlaskit/editor-common/utils");
-var _utils2 = require("../analytics/utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -127,7 +126,7 @@ var replaceDocument = exports.replaceDocument = function replaceDocument(doc, st
   }
   return tr;
 };
-var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index) {
+var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index, editorAnalyticsAPI) {
   var selectedUser = participants[index];
   if (selectedUser && selectedUser.cursorPos !== undefined && selectedUser.sessionId !== sessionId) {
     var state = editorView.state;
@@ -138,7 +137,7 @@ var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToColla
       eventType: _analytics.EVENT_TYPE.TRACK
     };
     tr.setSelection(_state.Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
-    tr = (0, _utils2.addAnalytics)(state, tr, analyticsPayload);
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(tr);
     tr.scrollIntoView();
     editorView.dispatch(tr);
     if (!editorView.hasFocus()) {

package/dist/cjs/plugins/extension/actions.js

@@ -18,7 +18,6 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _extensionEvents = require("../analytics/types/extension-events");
 var _utils2 = require("./utils");
 var _main = require("./pm-plugins/main");
 var _extensionApi = require("./extension-api");
@@ -56,7 +55,7 @@ var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(e
         bodiedExtension = _schema$nodes.bodiedExtension;
       var isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection);
       var extensionState = (0, _main.getPluginState)(state);
-      var targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
+      var targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
       var action = _analytics.ACTION.UPDATED;
       var tr = state.tr;
 
@@ -81,7 +80,7 @@ var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(e
         if (pos > -1) {
           tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
           tr.setSelection(_state2.Selection.near(tr.doc.resolve(pos)));
-          targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+          targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
         } else {
           action = _analytics.ACTION.ERRORED;
         }

package/dist/cjs/plugins/index.js

@@ -10,12 +10,6 @@ Object.defineProperty(exports, "alignmentPlugin", {
     return _alignment.default;
   }
 });
-Object.defineProperty(exports, "analyticsPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _analytics.default;
-  }
-});
 Object.defineProperty(exports, "annotationPlugin", {
   enumerable: true,
   get: function get() {
@@ -161,7 +155,6 @@ var _alignment = _interopRequireDefault(require("./alignment"));
 var _dataConsumer = _interopRequireDefault(require("./data-consumer"));
 var _indentation = _interopRequireDefault(require("./indentation"));
 var _annotation = _interopRequireDefault(require("./annotation"));
-var _analytics = _interopRequireDefault(require("./analytics"));
 var _customAutoformat = _interopRequireDefault(require("./custom-autoformat"));
 var _feedbackDialog = _interopRequireDefault(require("./feedback-dialog"));
 var _mobileDimensions = _interopRequireDefault(require("./mobile-dimensions"));

package/dist/cjs/presets/default.js

@@ -23,7 +23,6 @@ var _editorPluginFeatureFlags = require("@atlaskit/editor-plugin-feature-flags")
 var _editorPluginCopyButton = require("@atlaskit/editor-plugin-copy-button");
 var _editorPluginFloatingToolbar = require("@atlaskit/editor-plugin-floating-toolbar");
 var _editorPluginClipboard = require("@atlaskit/editor-plugin-clipboard");
-var _plugins = require("../plugins");
 var _editorPluginAnalytics = require("@atlaskit/editor-plugin-analytics");
 var _editorPluginPlaceholder = require("@atlaskit/editor-plugin-placeholder");
 var _annotation = _interopRequireDefault(require("../plugins/annotation"));
@@ -55,16 +54,6 @@ function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.analyticsPlugin, function (plugin, builder) {
-    if (options.allowAnalyticsGASV3) {
-      var performanceTracking = options.performanceTracking,
-        createAnalyticsEvent = options.createAnalyticsEvent;
-      return builder.add([plugin, {
-        createAnalyticsEvent: createAnalyticsEvent,
-        performanceTracking: performanceTracking
-      }]);
-    }
-    return builder;
   }).add(_editorPluginBetterTypeHistory.betterTypeHistoryPlugin).add([_paste.default, options.paste]).add(_editorPluginClipboard.clipboardPlugin).add(_editorPluginFocus.focusPlugin).add(_editorPluginComposition.compositionPlugin).add([_editorPluginBase.basePlugin, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin

package/dist/cjs/test-utils.js

@@ -22,9 +22,7 @@ Object.defineProperty(exports, "GapCursorSide", {
     return _selection.Side;
   }
 });
-exports.createPMSchemaAndPlugins = void 0;
-exports.getFireAnalytics = getFireAnalytics;
-exports.isElementBySelectorInDocument = void 0;
+exports.isElementBySelectorInDocument = exports.createPMSchemaAndPlugins = void 0;
 exports.setTextSelection = setTextSelection;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -32,16 +30,11 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _preset = require("@atlaskit/editor-common/preset");
 var _createSchema = require("./create-editor/create-schema");
 var _sortByOrder = require("./create-editor/sort-by-order");
-var _pluginKey = require("./plugins/analytics/plugin-key");
 var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _eventDispatcher = require("./event-dispatcher");
 var _selection = require("@atlaskit/editor-common/selection");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function getFireAnalytics(editorView) {
-  var _analyticsPluginKey$g;
-  return _pluginKey.analyticsPluginKey === null || _pluginKey.analyticsPluginKey === void 0 || (_analyticsPluginKey$g = _pluginKey.analyticsPluginKey.getState(editorView.state)) === null || _analyticsPluginKey$g === void 0 ? void 0 : _analyticsPluginKey$g.fireAnalytics;
-}
 function lightProcessPluginsList(editorPlugins) {
   /**
    * First pass to collect pluginsOptions

package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js

@@ -24,7 +24,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /** @jsx jsx */
 
 var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics, _editorAPI$analytics2;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -68,7 +68,8 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
     isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
-    featureFlags: props.featureFlags || {}
+    featureFlags: props.featureFlags || {},
+    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
@@ -77,7 +78,7 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     containerElement: props.containerElement,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
     featureFlags: props.featureFlags,
-    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions
+    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics2 = editorAPI.analytics) === null || _editorAPI$analytics2 === void 0 ? void 0 : _editorAPI$analytics2.actions
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   (0, _react.useEffect)(function () {
     if (twoLineEditorToolbar) {

package/dist/cjs/ui/ToolbarFeedback/index.js

@@ -31,7 +31,7 @@ var _eventDispatcher = require("../../event-dispatcher");
 var _feedbackDialog = require("../../plugins/feedback-dialog");
 var _deprecationWarnings = _interopRequireDefault(require("../../utils/deprecation-warnings"));
 var _pickBy = _interopRequireDefault(require("../../utils/pick-by"));
-var _consts = require("../../plugins/analytics/consts");
+var _utils = require("@atlaskit/editor-common/utils");
 var _context2 = require("../../presets/context");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -130,7 +130,7 @@ var ToolbarFeedbackInternal = /*#__PURE__*/function (_PureComponent) {
     })));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "openFeedbackPopup", function () {
       var dispatch = (0, _eventDispatcher.createDispatch)(_this.context.editorActions.eventDispatcher);
-      dispatch(_consts.analyticsEventKey, {
+      dispatch(_utils.analyticsEventKey, {
         payload: {
           action: _analytics.ACTION.CLICKED,
           actionSubject: _analytics.ACTION_SUBJECT.BUTTON,

package/dist/cjs/ui/WithHelpTrigger/index.js

@@ -16,7 +16,7 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _eventDispatcher = require("../../event-dispatcher");
-var _consts = require("../../plugins/analytics/consts");
+var _utils = require("@atlaskit/editor-common/utils");
 var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -33,7 +33,7 @@ var WithHelpTrigger = exports.default = /*#__PURE__*/function (_React$Component)
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "openHelp", function () {
       var editorActions = _this.context.editorActions;
       var dispatch = (0, _eventDispatcher.createDispatch)(editorActions.eventDispatcher);
-      dispatch(_consts.analyticsEventKey, {
+      dispatch(_utils.analyticsEventKey, {
         payload: {
           action: _analytics.ACTION.CLICKED,
           actionSubject: _analytics.ACTION_SUBJECT.BUTTON,

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.3.17";
+var version = exports.version = "189.3.19";

package/dist/es2019/plugins/avatar-group/index.js

@@ -18,13 +18,15 @@ const avatarGroup = ({
       eventDispatcher,
       dispatchAnalyticsEvent
     }) {
+      var _api$analytics;
       return /*#__PURE__*/React.createElement(AvatarGroupPluginWrapper, {
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         editorView: editorView,
         eventDispatcher: eventDispatcher,
         collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
         takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-        featureFlags: featureFlags
+        featureFlags: featureFlags,
+        editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
       });
     }
   };

package/dist/es2019/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -45,7 +45,8 @@ const AvatarGroupPluginWrapper = props => {
     inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,
     inviteToEditHandler: props.collabEdit && props.collabEdit.inviteToEditHandler,
     isInviteToEditButtonSelected: props.collabEdit && props.collabEdit.isInviteToEditButtonSelected,
-    featureFlags: featureFlags
+    featureFlags: featureFlags,
+    editorAnalyticsAPI: props.editorAnalyticsAPI
   }));
 };
 export default AvatarGroupPluginWrapper;

package/dist/es2019/plugins/collab-edit/ui/avatars-with-plugin-state.js

@@ -12,7 +12,8 @@ const AvatarsWithPluginState = props => {
     inviteToEditHandler: onClick,
     inviteToEditComponent: Component,
     editorView,
-    featureFlags
+    featureFlags,
+    editorAnalyticsAPI
   } = props;
   const render = React.useCallback(({
     data
@@ -24,14 +25,15 @@ const AvatarsWithPluginState = props => {
       sessionId: data.sessionId,
       participants: data.activeParticipants,
       editorView: editorView,
-      featureFlags: featureFlags
+      featureFlags: featureFlags,
+      editorAnalyticsAPI: editorAnalyticsAPI
     }, /*#__PURE__*/React.createElement(InviteToEditButton, {
       title: title,
       selected: selected,
       onClick: onClick,
       Component: Component
     }));
-  }, [selected, onClick, Component, title, editorView, featureFlags]);
+  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI]);
   return /*#__PURE__*/React.createElement(WithPluginState, {
     plugins: {
       data: collabEditPluginKey

package/dist/es2019/plugins/collab-edit/ui/avatars.js

@@ -31,7 +31,7 @@ export const Avatars = /*#__PURE__*/React.memo(props => {
 
       // user does not need to scroll to their own position (index 0)
       if (allowCollabAvatarScroll && index > 0) {
-        scrollToCollabCursor(editorView, participants, props.sessionId, index);
+        scrollToCollabCursor(editorView, participants, props.sessionId, index, props.editorAnalyticsAPI);
       }
     }
   }), props.children);

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

@@ -3,7 +3,6 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import * as themeColors from '@atlaskit/theme/colors';
 import { hexToRgba } from '@atlaskit/adf-schema';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/utils';
-import { addAnalytics } from '../analytics/utils';
 import { EVENT_TYPE, ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 // TODO: https://product-fabric.atlassian.net/browse/DSP-7269
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
@@ -110,7 +109,7 @@ export const replaceDocument = (doc, state, version, options, reserveCursor) =>
   }
   return tr;
 };
-export const scrollToCollabCursor = (editorView, participants, sessionId, index) => {
+export const scrollToCollabCursor = (editorView, participants, sessionId, index, editorAnalyticsAPI) => {
   const selectedUser = participants[index];
   if (selectedUser && selectedUser.cursorPos !== undefined && selectedUser.sessionId !== sessionId) {
     const {
@@ -123,7 +122,7 @@ export const scrollToCollabCursor = (editorView, participants, sessionId, index)
       eventType: EVENT_TYPE.TRACK
     };
     tr.setSelection(Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
-    tr = addAnalytics(state, tr, analyticsPayload);
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(tr);
     tr.scrollIntoView();
     editorView.dispatch(tr);
     if (!editorView.hasFocus()) {

package/dist/es2019/plugins/extension/actions.js

@@ -1,8 +1,7 @@
 import { Selection, NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { replaceSelectedNode, findSelectedNodeOfType, replaceParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export { transformSliceToRemoveOpenBodiedExtension } from '@atlaskit/editor-common/transforms';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { TARGET_SELECTION_SOURCE } from '../analytics/types/extension-events';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
 import { findExtensionWithLocalId } from './utils';
 import { getPluginState } from './pm-plugins/main';
 import { getEditInLegacyMacroBrowser, createExtensionAPI } from './extension-api';

package/dist/es2019/plugins/index.js

@@ -11,7 +11,6 @@ export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
-export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';

package/dist/es2019/presets/default.js

@@ -17,7 +17,6 @@ import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { copyButtonPlugin } from '@atlaskit/editor-plugin-copy-button';
 import { floatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import { clipboardPlugin } from '@atlaskit/editor-plugin-clipboard';
-import { analyticsPlugin as deprecatedAnalyticsPlugin } from '../plugins';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { placeholderPlugin } from '@atlaskit/editor-plugin-placeholder';
 import annotationPlugin from '../plugins/annotation';
@@ -49,18 +48,6 @@ export function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).maybeAdd(deprecatedAnalyticsPlugin, (plugin, builder) => {
-    if (options.allowAnalyticsGASV3) {
-      const {
-        performanceTracking,
-        createAnalyticsEvent
-      } = options;
-      return builder.add([plugin, {
-        createAnalyticsEvent,
-        performanceTracking
-      }]);
-    }
-    return builder;
   }).add(betterTypeHistoryPlugin).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add(compositionPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, (p, builder) => {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin

package/dist/es2019/test-utils.js

@@ -2,12 +2,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import { createSchema } from './create-editor/create-schema';
 import { sortByOrder } from './create-editor/sort-by-order';
-import { analyticsPluginKey } from './plugins/analytics/plugin-key';
 import { basePlugin } from '@atlaskit/editor-plugin-base';
-export function getFireAnalytics(editorView) {
-  var _analyticsPluginKey$g;
-  return analyticsPluginKey === null || analyticsPluginKey === void 0 ? void 0 : (_analyticsPluginKey$g = analyticsPluginKey.getState(editorView.state)) === null || _analyticsPluginKey$g === void 0 ? void 0 : _analyticsPluginKey$g.fireAnalytics;
-}
 function lightProcessPluginsList(editorPlugins) {
   /**
    * First pass to collect pluginsOptions

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -13,7 +13,7 @@ import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { usePresetContext } from '../../../presets/context';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics, _editorAPI$analytics2;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
   const editorAPI = usePresetContext();
 
@@ -54,7 +54,8 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
     isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
-    featureFlags: props.featureFlags || {}
+    featureFlags: props.featureFlags || {},
+    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
@@ -63,7 +64,7 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     containerElement: props.containerElement,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
     featureFlags: props.featureFlags,
-    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions
+    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics2 = editorAPI.analytics) === null || _editorAPI$analytics2 === void 0 ? void 0 : _editorAPI$analytics2.actions
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   useEffect(() => {
     if (twoLineEditorToolbar) {

package/dist/es2019/ui/ToolbarFeedback/index.js

@@ -17,7 +17,7 @@ import { createDispatch } from '../../event-dispatcher';
 import { openFeedbackDialog } from '../../plugins/feedback-dialog';
 import deprecationWarnings from '../../utils/deprecation-warnings';
 import pickBy from '../../utils/pick-by';
-import { analyticsEventKey } from '../../plugins/analytics/consts';
+import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { usePresetContext } from '../../presets/context';
 const PopupWithOutsideListeners = withOuterListeners(Popup);
 const POPUP_HEIGHT = 388;

package/dist/es2019/ui/WithHelpTrigger/index.js

@@ -3,7 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { createDispatch } from '../../event-dispatcher';
-import { analyticsEventKey } from '../../plugins/analytics/consts';
+import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { deprecatedOpenHelpCommand } from '@atlaskit/editor-plugin-help-dialog';
 export default class WithHelpTrigger extends React.Component {
   constructor(...args) {

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.3.17";
+export const version = "189.3.19";

package/dist/esm/plugins/avatar-group/index.js

@@ -8,6 +8,7 @@ var avatarGroup = function avatarGroup(_ref) {
   return {
     name: 'avatarGroup',
     primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
+      var _api$analytics;
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,
         popupsBoundariesElement = _ref2.popupsBoundariesElement,
@@ -22,7 +23,8 @@ var avatarGroup = function avatarGroup(_ref) {
         eventDispatcher: eventDispatcher,
         collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
         takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-        featureFlags: featureFlags
+        featureFlags: featureFlags,
+        editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
       });
     }
   };

package/dist/esm/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -34,7 +34,8 @@ var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
     inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,
     inviteToEditHandler: props.collabEdit && props.collabEdit.inviteToEditHandler,
     isInviteToEditButtonSelected: props.collabEdit && props.collabEdit.isInviteToEditButtonSelected,
-    featureFlags: featureFlags
+    featureFlags: featureFlags,
+    editorAnalyticsAPI: props.editorAnalyticsAPI
   }));
 };
 export default AvatarGroupPluginWrapper;

package/dist/esm/plugins/collab-edit/ui/avatars-with-plugin-state.js

@@ -11,7 +11,8 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
     onClick = props.inviteToEditHandler,
     Component = props.inviteToEditComponent,
     editorView = props.editorView,
-    featureFlags = props.featureFlags;
+    featureFlags = props.featureFlags,
+    editorAnalyticsAPI = props.editorAnalyticsAPI;
   var render = React.useCallback(function (_ref) {
     var data = _ref.data;
     if (!data) {
@@ -21,14 +22,15 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
       sessionId: data.sessionId,
       participants: data.activeParticipants,
       editorView: editorView,
-      featureFlags: featureFlags
+      featureFlags: featureFlags,
+      editorAnalyticsAPI: editorAnalyticsAPI
     }, /*#__PURE__*/React.createElement(InviteToEditButton, {
       title: title,
       selected: selected,
       onClick: onClick,
       Component: Component
     }));
-  }, [selected, onClick, Component, title, editorView, featureFlags]);
+  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI]);
   return /*#__PURE__*/React.createElement(WithPluginState, {
     plugins: {
       data: collabEditPluginKey

package/dist/esm/plugins/collab-edit/ui/avatars.js

@@ -31,7 +31,7 @@ export var Avatars = /*#__PURE__*/React.memo(function (props) {
 
       // user does not need to scroll to their own position (index 0)
       if (allowCollabAvatarScroll && index > 0) {
-        scrollToCollabCursor(editorView, participants, props.sessionId, index);
+        scrollToCollabCursor(editorView, participants, props.sessionId, index, props.editorAnalyticsAPI);
       }
     }
   }), props.children);

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

@@ -4,7 +4,6 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import * as themeColors from '@atlaskit/theme/colors';
 import { hexToRgba } from '@atlaskit/adf-schema';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/utils';
-import { addAnalytics } from '../analytics/utils';
 import { EVENT_TYPE, ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 // TODO: https://product-fabric.atlassian.net/browse/DSP-7269
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
@@ -117,7 +116,7 @@ export var replaceDocument = function replaceDocument(doc, state, version, optio
   }
   return tr;
 };
-export var scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index) {
+export var scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index, editorAnalyticsAPI) {
   var selectedUser = participants[index];
   if (selectedUser && selectedUser.cursorPos !== undefined && selectedUser.sessionId !== sessionId) {
     var state = editorView.state;
@@ -128,7 +127,7 @@ export var scrollToCollabCursor = function scrollToCollabCursor(editorView, part
       eventType: EVENT_TYPE.TRACK
     };
     tr.setSelection(Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
-    tr = addAnalytics(state, tr, analyticsPayload);
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(tr);
     tr.scrollIntoView();
     editorView.dispatch(tr);
     if (!editorView.hasFocus()) {

package/dist/esm/plugins/extension/actions.js

@@ -6,8 +6,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Selection, NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { replaceSelectedNode, findSelectedNodeOfType, replaceParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export { transformSliceToRemoveOpenBodiedExtension } from '@atlaskit/editor-common/transforms';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { TARGET_SELECTION_SOURCE } from '../analytics/types/extension-events';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
 import { findExtensionWithLocalId } from './utils';
 import { getPluginState } from './pm-plugins/main';
 import { getEditInLegacyMacroBrowser, createExtensionAPI } from './extension-api';

package/dist/esm/plugins/index.js

@@ -11,7 +11,6 @@ export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
-export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';