@atlaskit/editor-core 189.3.18 → 189.3.20

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/ContentStyles/index.js

@@ -13,7 +13,7 @@ import { mediaStyles } from './media';
 import { layoutStyles } from './layout';
 import { panelStyles } from './panel';
 import { placeholderTextStyles } from '@atlaskit/editor-plugin-placeholder-text/styles';
-import { extensionStyles } from '../../plugins/extension/ui/styles';
+import { extensionStyles } from './extension';
 import { expandStyles } from './expand';
 import { MediaSharedClassNames } from '@atlaskit/editor-common/styles';
 import { findReplaceStyles } from '../../plugins/find-replace/styles';

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/utils/nodes-by-localIds.js

@@ -1,30 +1,3 @@
-export const findNodePosByLocalIds = (state, ids, option = {}) => {
-  var _state$doc$attrs;
-  if (ids.length === 0) {
-    return [];
-  }
-  const nodes = [];
-  const localIdSet = new Set(ids);
-  if (option.includeDocNode && localIdSet.has((_state$doc$attrs = state.doc.attrs) === null || _state$doc$attrs === void 0 ? void 0 : _state$doc$attrs.localId)) {
-    nodes.push({
-      node: state.doc,
-      pos: 0
-    });
-  }
-  state.doc.descendants((node, pos) => {
-    var _node$attrs;
-    if (localIdSet.has((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId)) {
-      nodes.push({
-        node,
-        pos
-      });
-    }
-
-    // stop traversing once we found all the nodes
-    return localIdSet.size !== nodes.length;
-  });
-  return nodes;
-};
 export const findNodePosByFragmentLocalIds = (state, ids) => {
   if (ids.length === 0) {
     return [];

package/dist/es2019/utils/selection.js

@@ -1,6 +1,3 @@
-import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 export { setNodeSelection, setTextSelection, setAllSelection, setCellSelection } from '@atlaskit/editor-common/utils';
 
 // checks if the given position is within the ProseMirror document
@@ -9,15 +6,4 @@ export const isValidPosition = (pos, state) => {
     return true;
   }
   return false;
-};
-export const duplicateSelection = (selectionToDuplicate, doc) => {
-  if (selectionToDuplicate instanceof NodeSelection) {
-    return NodeSelection.create(doc, selectionToDuplicate.from);
-  } else if (selectionToDuplicate instanceof TextSelection) {
-    return TextSelection.create(doc, selectionToDuplicate.from, selectionToDuplicate.to);
-  } else if (selectionToDuplicate instanceof GapCursorSelection) {
-    return new GapCursorSelection(doc.resolve(selectionToDuplicate.from), selectionToDuplicate.side);
-  } else if (selectionToDuplicate instanceof CellSelection) {
-    return new CellSelection(doc.resolve(selectionToDuplicate.$anchorCell.pos), doc.resolve(selectionToDuplicate.$headCell.pos));
-  }
 };

package/dist/es2019/version-wrapper.js

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

package/dist/esm/actions/index.js

@@ -6,10 +6,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Node } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { analyticsEventKey, isEmptyDocument, processRawValue } from '@atlaskit/editor-common/utils';
+import { analyticsEventKey, isEmptyDocument, processRawValue, findNodePosByLocalIds } from '@atlaskit/editor-common/utils';
 import { createDispatch } from '../event-dispatcher';
 import { getCollabProvider } from '../plugins/collab-edit/native-collab-provider-plugin';
-import { findNodePosWithLocalId } from '../plugins/extension/utils';
 import { toJSON } from '../utils';
 import { __temporaryFixForConfigPanel as _temporaryFixForConfigPanel, getEditorValueWithMedia } from '../utils/action';
 import deprecationWarnings from '../utils/deprecation-warnings';
@@ -255,8 +254,10 @@ var EditorActions = /*#__PURE__*/function () {
     value: function getNodeByLocalId(id) {
       var _this$editorView;
       if ((_this$editorView = this.editorView) !== null && _this$editorView !== void 0 && _this$editorView.state) {
-        var _findNodePosWithLocal, _this$editorView2;
-        return (_findNodePosWithLocal = findNodePosWithLocalId((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, id)) === null || _findNodePosWithLocal === void 0 ? void 0 : _findNodePosWithLocal.node;
+        var _this$editorView2;
+        var nodes = findNodePosByLocalIds((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, [id]);
+        var node = nodes.length >= 1 ? nodes[0] : undefined;
+        return node === null || node === void 0 ? void 0 : node.node;
       }
     }
   }, {

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/code-bidi-warning/pm-plugins/plugin-factory.js

@@ -7,7 +7,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import CodeBidiWarning from '@atlaskit/code/bidi-warning';
 import codeBidiWarningDecorator from '@atlaskit/code/bidi-warning-decorator';
 import { pluginFactory } from '../../../utils/plugin-state-factory';
-import { stepHasSlice } from '../../../utils/step';
+import { stepHasSlice } from '@atlaskit/editor-common/utils';
 import { codeBidiWarningPluginKey } from '../plugin-key';
 import reducer from './reducer';
 var _pluginFactory = pluginFactory(codeBidiWarningPluginKey, reducer, {

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/extension/context-panel.js

@@ -9,12 +9,13 @@ import React from 'react';
 import { getExtensionKeyAndNodeKey } from '@atlaskit/editor-common/extensions';
 import { getPluginState } from './pm-plugins/main';
 import { getSelectedExtension } from './utils';
-import WithEditorActions from '../../ui/WithEditorActions';
 import ConfigPanelLoader from '../../ui/ConfigPanel/ConfigPanelLoader';
-import { duplicateSelection } from '../../utils/selection';
 import { clearEditingContext, forceAutoSave, updateState } from './commands';
 import { buildExtensionNode } from './actions';
 import { SaveIndicator } from './ui/SaveIndicator/SaveIndicator';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 var areParametersEqual = function areParametersEqual(firstParameters, secondParameters) {
   if (_typeof(firstParameters) === 'object' && _typeof(secondParameters) === 'object' && firstParameters !== null && secondParameters !== null) {
     var firstKeys = Object.keys(firstParameters);
@@ -25,116 +26,125 @@ var areParametersEqual = function areParametersEqual(firstParameters, secondPara
   }
   return firstParameters === secondParameters;
 };
-export var getContextPanel = function getContextPanel(allowAutoSave, featureFlags, applyChange) {
-  return function (state) {
-    var nodeWithPos = getSelectedExtension(state, true);
+export var duplicateSelection = function duplicateSelection(selectionToDuplicate, doc) {
+  if (selectionToDuplicate instanceof NodeSelection) {
+    return NodeSelection.create(doc, selectionToDuplicate.from);
+  } else if (selectionToDuplicate instanceof TextSelection) {
+    return TextSelection.create(doc, selectionToDuplicate.from, selectionToDuplicate.to);
+  } else if (selectionToDuplicate instanceof GapCursorSelection) {
+    return new GapCursorSelection(doc.resolve(selectionToDuplicate.from), selectionToDuplicate.side);
+  } else if (selectionToDuplicate instanceof CellSelection) {
+    return new CellSelection(doc.resolve(selectionToDuplicate.$anchorCell.pos), doc.resolve(selectionToDuplicate.$headCell.pos));
+  }
+};
+export var getContextPanel = function getContextPanel(getEditorView) {
+  return function (allowAutoSave, featureFlags, applyChange) {
+    return function (state) {
+      var nodeWithPos = getSelectedExtension(state, true);
 
-    // Adding checks to bail out early
-    if (!nodeWithPos) {
-      return;
-    }
-    var extensionState = getPluginState(state);
-    var autoSaveResolve = extensionState.autoSaveResolve,
-      autoSaveReject = extensionState.autoSaveReject,
-      showContextPanel = extensionState.showContextPanel,
-      extensionProvider = extensionState.extensionProvider,
-      processParametersBefore = extensionState.processParametersBefore,
-      processParametersAfter = extensionState.processParametersAfter;
-    if (extensionState && showContextPanel && extensionProvider && processParametersAfter) {
-      var _nodeWithPos$node$att = nodeWithPos.node.attrs,
-        extensionType = _nodeWithPos$node$att.extensionType,
-        extensionKey = _nodeWithPos$node$att.extensionKey,
-        parameters = _nodeWithPos$node$att.parameters;
-      var _getExtensionKeyAndNo = getExtensionKeyAndNodeKey(extensionKey, extensionType),
-        _getExtensionKeyAndNo2 = _slicedToArray(_getExtensionKeyAndNo, 2),
-        extKey = _getExtensionKeyAndNo2[0],
-        nodeKey = _getExtensionKeyAndNo2[1];
-      var configParams = processParametersBefore ? processParametersBefore(parameters || {}) : parameters;
-      return /*#__PURE__*/React.createElement(SaveIndicator, {
-        duration: 5000,
-        visible: allowAutoSave
-      }, function (_ref) {
-        var onSaveStarted = _ref.onSaveStarted,
-          onSaveEnded = _ref.onSaveEnded;
-        return /*#__PURE__*/React.createElement(WithEditorActions, {
-          render: function render(actions) {
-            var editorView = actions._privateGetEditorView();
-            if (!editorView) {
-              return null;
-            }
-            return /*#__PURE__*/React.createElement(ConfigPanelLoader, {
-              showHeader: true,
-              closeOnEsc: true,
-              extensionType: extensionType,
-              extensionKey: extKey,
-              nodeKey: nodeKey,
-              extensionParameters: parameters,
-              parameters: configParams,
-              extensionProvider: extensionProvider,
-              autoSave: allowAutoSave,
-              autoSaveTrigger: autoSaveResolve,
-              autoSaveReject: autoSaveReject,
-              onChange: /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(updatedParameters) {
-                  return _regeneratorRuntime.wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return onChangeAction(editorView, updatedParameters, parameters, nodeWithPos, onSaveStarted);
-                      case 2:
-                        onSaveEnded();
-                        if (autoSaveResolve) {
-                          autoSaveResolve();
-                        }
-                        if (!allowAutoSave) {
-                          clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
-                        }
-                      case 5:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function (_x) {
-                  return _ref2.apply(this, arguments);
-                };
-              }(),
-              onCancel: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-                return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+      // Adding checks to bail out early
+      if (!nodeWithPos) {
+        return;
+      }
+      var extensionState = getPluginState(state);
+      var autoSaveResolve = extensionState.autoSaveResolve,
+        autoSaveReject = extensionState.autoSaveReject,
+        showContextPanel = extensionState.showContextPanel,
+        extensionProvider = extensionState.extensionProvider,
+        processParametersBefore = extensionState.processParametersBefore,
+        processParametersAfter = extensionState.processParametersAfter;
+      if (extensionState && showContextPanel && extensionProvider && processParametersAfter) {
+        var _nodeWithPos$node$att = nodeWithPos.node.attrs,
+          extensionType = _nodeWithPos$node$att.extensionType,
+          extensionKey = _nodeWithPos$node$att.extensionKey,
+          parameters = _nodeWithPos$node$att.parameters;
+        var _getExtensionKeyAndNo = getExtensionKeyAndNodeKey(extensionKey, extensionType),
+          _getExtensionKeyAndNo2 = _slicedToArray(_getExtensionKeyAndNo, 2),
+          extKey = _getExtensionKeyAndNo2[0],
+          nodeKey = _getExtensionKeyAndNo2[1];
+        var configParams = processParametersBefore ? processParametersBefore(parameters || {}) : parameters;
+        return /*#__PURE__*/React.createElement(SaveIndicator, {
+          duration: 5000,
+          visible: allowAutoSave
+        }, function (_ref) {
+          var onSaveStarted = _ref.onSaveStarted,
+            onSaveEnded = _ref.onSaveEnded;
+          var editorView = getEditorView === null || getEditorView === void 0 ? void 0 : getEditorView();
+          if (!editorView) {
+            return null;
+          }
+          return /*#__PURE__*/React.createElement(ConfigPanelLoader, {
+            showHeader: true,
+            closeOnEsc: true,
+            extensionType: extensionType,
+            extensionKey: extKey,
+            nodeKey: nodeKey,
+            extensionParameters: parameters,
+            parameters: configParams,
+            extensionProvider: extensionProvider,
+            autoSave: allowAutoSave,
+            autoSaveTrigger: autoSaveResolve,
+            autoSaveReject: autoSaveReject,
+            onChange: /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(updatedParameters) {
+                return _regeneratorRuntime.wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
                     case 0:
+                      _context.next = 2;
+                      return onChangeAction(editorView, updatedParameters, parameters, nodeWithPos, onSaveStarted);
+                    case 2:
+                      onSaveEnded();
+                      if (autoSaveResolve) {
+                        autoSaveResolve();
+                      }
                       if (!allowAutoSave) {
-                        _context2.next = 9;
-                        break;
+                        clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
                       }
-                      _context2.prev = 1;
-                      _context2.next = 4;
-                      return new Promise(function (resolve, reject) {
-                        forceAutoSave(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
-                      });
-                    case 4:
-                      _context2.next = 9;
-                      break;
-                    case 6:
-                      _context2.prev = 6;
-                      _context2.t0 = _context2["catch"](1);
-                      // Even if the save failed, we should proceed with closing the panel
-                      // eslint-disable-next-line no-console
-                      console.error("Autosave failed with error", _context2.t0);
-                    case 9:
-                      clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
-                    case 10:
+                    case 5:
                     case "end":
-                      return _context2.stop();
+                      return _context.stop();
                   }
-                }, _callee2, null, [[1, 6]]);
-              })),
-              featureFlags: featureFlags
-            });
-          }
+                }, _callee);
+              }));
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }(),
+            onCancel: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+              return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    if (!allowAutoSave) {
+                      _context2.next = 9;
+                      break;
+                    }
+                    _context2.prev = 1;
+                    _context2.next = 4;
+                    return new Promise(function (resolve, reject) {
+                      forceAutoSave(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
+                    });
+                  case 4:
+                    _context2.next = 9;
+                    break;
+                  case 6:
+                    _context2.prev = 6;
+                    _context2.t0 = _context2["catch"](1);
+                    // Even if the save failed, we should proceed with closing the panel
+                    // eslint-disable-next-line no-console
+                    console.error("Autosave failed with error", _context2.t0);
+                  case 9:
+                    clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
+                  case 10:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2, null, [[1, 6]]);
+            })),
+            featureFlags: featureFlags
+          });
         });
-      });
-    }
+      }
+    };
   };
 };
 export function onChangeAction(_x2) {

package/dist/esm/plugins/extension/extension-api.js

@@ -5,7 +5,7 @@ import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { insertMacroFromMacroBrowser } from './pm-plugins/macro/actions';
 import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
-import { nodeToJSON } from '../../utils';
+import { nodeToJSON } from '@atlaskit/editor-common/utils';
 import { setEditingContextToContextPanel } from './commands';
 import { findNodePosWithLocalId, getDataConsumerMark, getNodeTypesReferenced, getSelectedExtension } from './utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';

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

@@ -99,7 +99,10 @@ var extensionPlugin = function extensionPlugin(_ref) {
         applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel3 = _api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange,
         editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics3 = _api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions
       }),
-      contextPanel: getContextPanel(options.allowAutoSave, featureFlags, _api === null || _api === void 0 || (_api$contextPanel4 = _api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange)
+      contextPanel: getContextPanel(function () {
+        var _editorViewRef$curren;
+        return (_editorViewRef$curren = editorViewRef.current) !== null && _editorViewRef$curren !== void 0 ? _editorViewRef$curren : undefined;
+      })(options.allowAutoSave, featureFlags, _api === null || _api === void 0 || (_api$contextPanel4 = _api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange)
     }
   };
 };

package/dist/esm/plugins/extension/plugin-factory.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
-import { pluginFactory } from '../../utils/plugin-state-factory';
+import { pluginFactory } from '@atlaskit/editor-common/utils';
 import reducer from './reducer';
 import { pluginKey } from './plugin-key';
 var factory = pluginFactory(pluginKey, reducer, {

package/dist/esm/plugins/extension/pm-plugins/macro/actions.js

@@ -9,8 +9,7 @@ import { safeInsert, replaceSelectedNode, findSelectedNodeOfType, replaceParentN
 import { getValidNode } from '@atlaskit/editor-common/validator';
 import { normaliseNestedLayout } from '@atlaskit/editor-common/insert';
 import { getPluginState as getExtensionPluginState } from '../../plugin-factory';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
 import { pluginKey } from './plugin-key';
 export var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(editorAnalyticsAPI) {
   return function (macroProvider, macroNode, isEditing) {

package/dist/esm/plugins/extension/pm-plugins/unique-id.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
-import { stepAddsOneOf } from '../../../utils/step';
+import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 var pluginKey = new PluginKey('extensionUniqueIdPlugin');
 var createPlugin = function createPlugin() {
   return new SafePlugin({

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

@@ -6,7 +6,7 @@ import EditIcon from '@atlaskit/icon/glyph/editor/edit';
 import FullWidthIcon from '@atlaskit/icon/glyph/editor/media-full-width';
 import WideIcon from '@atlaskit/icon/glyph/editor/media-wide';
 import CenterIcon from '@atlaskit/icon/glyph/editor/media-center';
-import commonMessages from '../../messages';
+import commonMessages from '@atlaskit/editor-common/messages';
 import { editExtension } from './actions';
 import { getPluginState } from './pm-plugins/main';
 import { getSelectedExtension } from './utils';

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

@@ -1,6 +1,5 @@
 import { findParentNodeOfType, findSelectedNodeOfType, findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { closestElement } from '../../utils/dom';
-import { findNodePosByLocalIds } from '../../utils/nodes-by-localIds';
+import { findNodePosByLocalIds, closestElement } from '@atlaskit/editor-common/utils';
 export var getSelectedExtension = function getSelectedExtension(state) {
   var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var _state$schema$nodes = state.schema.nodes,

package/dist/esm/plugins/find-replace/plugin.js

@@ -9,7 +9,7 @@ import reducer from './reducer';
 import { findReplacePluginKey } from './types';
 import { findMatches, createDecorations, removeDecorationsFromSet, findSearchIndex, removeMatchesFromSet, findDecorationFromMatch, isMatchAffectedByStep } from './utils';
 import { findUniqueItemsIn } from '../../utils/array';
-import { stepHasSlice } from '../../utils/step';
+import { stepHasSlice } from '@atlaskit/editor-common/utils';
 export var initialState = {
   isActive: false,
   shouldFocus: false,

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';