@atlaskit/editor-core 189.3.18 → 189.3.20

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 189.3.20
+
+### Patch Changes
+
+- [#43094](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43094) [`c797611f8ad`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c797611f8ad) - Internally decouple extension plugin from editor-core.
+- Updated dependencies
+
+## 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

package/dist/cjs/actions/index.js

@@ -16,8 +16,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _eventDispatcher = require("../event-dispatcher");
 var _nativeCollabProviderPlugin = require("../plugins/collab-edit/native-collab-provider-plugin");
-var _utils3 = require("../plugins/extension/utils");
-var _utils4 = require("../utils");
+var _utils3 = require("../utils");
 var _action = require("../utils/action");
 var _deprecationWarnings = _interopRequireDefault(require("../utils/deprecation-warnings"));
 var _document = require("../utils/document");
@@ -237,7 +236,7 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
               return (0, _action.getEditorValueWithMedia)(editorView);
             case 5:
               doc = _context3.sent;
-              json = (0, _utils4.toJSON)(doc);
+              json = (0, _utils3.toJSON)(doc);
               if (this.contentEncode) {
                 _context3.next = 9;
                 break;
@@ -262,8 +261,10 @@ var EditorActions = exports.default = /*#__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 = (0, _utils3.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 = (0, _utils2.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/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/code-bidi-warning/pm-plugins/plugin-factory.js

@@ -13,14 +13,14 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _bidiWarning = _interopRequireDefault(require("@atlaskit/code/bidi-warning"));
 var _bidiWarningDecorator = _interopRequireDefault(require("@atlaskit/code/bidi-warning-decorator"));
 var _pluginStateFactory = require("../../../utils/plugin-state-factory");
-var _step = require("../../../utils/step");
+var _utils = require("@atlaskit/editor-common/utils");
 var _pluginKey = require("../plugin-key");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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; }
 var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(_pluginKey.codeBidiWarningPluginKey, _reducer.default, {
     onDocChanged: function onDocChanged(tr, pluginState) {
-      if (!tr.steps.find(_step.stepHasSlice)) {
+      if (!tr.steps.find(_utils.stepHasSlice)) {
         return pluginState;
       }
       var newBidiWarningsDecorationSet = createBidiWarningsDecorationSetFromDoc({

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getContextPanel = void 0;
+exports.getContextPanel = exports.duplicateSelection = void 0;
 exports.onChangeAction = onChangeAction;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -15,12 +15,13 @@ var _react = _interopRequireDefault(require("react"));
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _main = require("./pm-plugins/main");
 var _utils = require("./utils");
-var _WithEditorActions = _interopRequireDefault(require("../../ui/WithEditorActions"));
 var _ConfigPanelLoader = _interopRequireDefault(require("../../ui/ConfigPanel/ConfigPanelLoader"));
-var _selection = require("../../utils/selection");
 var _commands = require("./commands");
 var _actions = require("./actions");
 var _SaveIndicator = require("./ui/SaveIndicator/SaveIndicator");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _state = require("@atlaskit/editor-prosemirror/state");
+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; }
 var areParametersEqual = function areParametersEqual(firstParameters, secondParameters) {
@@ -33,116 +34,125 @@ var areParametersEqual = function areParametersEqual(firstParameters, secondPara
   }
   return firstParameters === secondParameters;
 };
-var getContextPanel = exports.getContextPanel = function getContextPanel(allowAutoSave, featureFlags, applyChange) {
-  return function (state) {
-    var nodeWithPos = (0, _utils.getSelectedExtension)(state, true);
+var duplicateSelection = exports.duplicateSelection = function duplicateSelection(selectionToDuplicate, doc) {
+  if (selectionToDuplicate instanceof _state.NodeSelection) {
+    return _state.NodeSelection.create(doc, selectionToDuplicate.from);
+  } else if (selectionToDuplicate instanceof _state.TextSelection) {
+    return _state.TextSelection.create(doc, selectionToDuplicate.from, selectionToDuplicate.to);
+  } else if (selectionToDuplicate instanceof _selection.GapCursorSelection) {
+    return new _selection.GapCursorSelection(doc.resolve(selectionToDuplicate.from), selectionToDuplicate.side);
+  } else if (selectionToDuplicate instanceof _cellSelection.CellSelection) {
+    return new _cellSelection.CellSelection(doc.resolve(selectionToDuplicate.$anchorCell.pos), doc.resolve(selectionToDuplicate.$headCell.pos));
+  }
+};
+var getContextPanel = exports.getContextPanel = function getContextPanel(getEditorView) {
+  return function (allowAutoSave, featureFlags, applyChange) {
+    return function (state) {
+      var nodeWithPos = (0, _utils.getSelectedExtension)(state, true);
 
-    // Adding checks to bail out early
-    if (!nodeWithPos) {
-      return;
-    }
-    var extensionState = (0, _main.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 = (0, _extensions.getExtensionKeyAndNodeKey)(extensionKey, extensionType),
-        _getExtensionKeyAndNo2 = (0, _slicedToArray2.default)(_getExtensionKeyAndNo, 2),
-        extKey = _getExtensionKeyAndNo2[0],
-        nodeKey = _getExtensionKeyAndNo2[1];
-      var configParams = processParametersBefore ? processParametersBefore(parameters || {}) : parameters;
-      return /*#__PURE__*/_react.default.createElement(_SaveIndicator.SaveIndicator, {
-        duration: 5000,
-        visible: allowAutoSave
-      }, function (_ref) {
-        var onSaveStarted = _ref.onSaveStarted,
-          onSaveEnded = _ref.onSaveEnded;
-        return /*#__PURE__*/_react.default.createElement(_WithEditorActions.default, {
-          render: function render(actions) {
-            var editorView = actions._privateGetEditorView();
-            if (!editorView) {
-              return null;
-            }
-            return /*#__PURE__*/_react.default.createElement(_ConfigPanelLoader.default, {
-              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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(updatedParameters) {
-                  return _regenerator.default.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) {
-                          (0, _commands.clearEditingContext)(applyChange)(editorView.state, editorView.dispatch);
-                        }
-                      case 5:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function (_x) {
-                  return _ref2.apply(this, arguments);
-                };
-              }(),
-              onCancel: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-                return _regenerator.default.wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+      // Adding checks to bail out early
+      if (!nodeWithPos) {
+        return;
+      }
+      var extensionState = (0, _main.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 = (0, _extensions.getExtensionKeyAndNodeKey)(extensionKey, extensionType),
+          _getExtensionKeyAndNo2 = (0, _slicedToArray2.default)(_getExtensionKeyAndNo, 2),
+          extKey = _getExtensionKeyAndNo2[0],
+          nodeKey = _getExtensionKeyAndNo2[1];
+        var configParams = processParametersBefore ? processParametersBefore(parameters || {}) : parameters;
+        return /*#__PURE__*/_react.default.createElement(_SaveIndicator.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.default.createElement(_ConfigPanelLoader.default, {
+            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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(updatedParameters) {
+                return _regenerator.default.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;
+                        (0, _commands.clearEditingContext)(applyChange)(editorView.state, editorView.dispatch);
                       }
-                      _context2.prev = 1;
-                      _context2.next = 4;
-                      return new Promise(function (resolve, reject) {
-                        (0, _commands.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:
-                      (0, _commands.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__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+              return _regenerator.default.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) {
+                      (0, _commands.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:
+                    (0, _commands.clearEditingContext)(applyChange)(editorView.state, editorView.dispatch);
+                  case 10:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2, null, [[1, 6]]);
+            })),
+            featureFlags: featureFlags
+          });
         });
-      });
-    }
+      }
+    };
   };
 };
 function onChangeAction(_x2) {
@@ -236,7 +246,7 @@ function _onChangeAction() {
           // when replacing the node
           prevSelection = editorView.state.selection;
           if (!prevSelection.eq(transaction.selection)) {
-            selection = (0, _selection.duplicateSelection)(prevSelection, transaction.doc);
+            selection = duplicateSelection(prevSelection, transaction.doc);
             if (selection) {
               transaction.setSelection(selection);
             }

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

@@ -12,7 +12,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _actions = require("./pm-plugins/macro/actions");
 var _pluginKey = require("./pm-plugins/macro/plugin-key");
-var _utils = require("../../utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("./commands");
 var _utils2 = require("./utils");
 var _analytics = require("@atlaskit/editor-common/analytics");

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

@@ -106,7 +106,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: (0, _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: (0, _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/cjs/plugins/extension/plugin-factory.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _pluginStateFactory = require("../../utils/plugin-state-factory");
+var _utils = require("@atlaskit/editor-common/utils");
 var _reducer = _interopRequireDefault(require("./reducer"));
 var _pluginKey = require("./plugin-key");
 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; }
-var factory = (0, _pluginStateFactory.pluginFactory)(_pluginKey.pluginKey, _reducer.default, {
+var factory = (0, _utils.pluginFactory)(_pluginKey.pluginKey, _reducer.default, {
   mapping: function mapping(tr, state) {
     var _ref = state,
       previousPositions = _ref.positions;

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

@@ -9,7 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _step = require("../../../utils/step");
+var _utils = require("@atlaskit/editor-common/utils");
 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; }
 var pluginKey = new _state.PluginKey('extensionUniqueIdPlugin');
@@ -31,7 +31,7 @@ var createPlugin = exports.createPlugin = function createPlugin() {
           return;
         }
         var isAddingExtension = transaction.steps.some(function (step) {
-          return (0, _step.stepAddsOneOf)(step, extensionTypes);
+          return (0, _utils.stepAddsOneOf)(step, extensionTypes);
         });
         if (isAddingExtension) {
           // Can't simply look at changed nodes, as we could be adding an extension

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

@@ -13,7 +13,7 @@ var _edit = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/edit"));
 var _mediaFullWidth = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-full-width"));
 var _mediaWide = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-wide"));
 var _mediaCenter = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-center"));
-var _messages = _interopRequireDefault(require("../../messages"));
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
 var _actions = require("./actions");
 var _main = require("./pm-plugins/main");
 var _utils2 = require("./utils");

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

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSelectedExtension = exports.getSelectedDomElement = exports.getNodeTypesReferenced = exports.getDataConsumerMark = exports.findNodePosWithLocalId = exports.findExtensionWithLocalId = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _dom = require("../../utils/dom");
-var _nodesByLocalIds = require("../../utils/nodes-by-localIds");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var getSelectedExtension = exports.getSelectedExtension = function getSelectedExtension(state) {
   var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var _state$schema$nodes = state.schema.nodes,
@@ -49,7 +48,7 @@ var getSelectedDomElement = exports.getSelectedDomElement = function getSelected
     // Search down
     selectedExtensionDomNode.querySelector('.extension-container') :
     // Try searching up and then down
-    (0, _dom.closestElement)(selectedExtensionDomNode, '.extension-container') || selectedExtensionDomNode.querySelector('.extension-container')) || selectedExtensionDomNode
+    (0, _utils2.closestElement)(selectedExtensionDomNode, '.extension-container') || selectedExtensionDomNode.querySelector('.extension-container')) || selectedExtensionDomNode
   );
 };
 var getDataConsumerMark = exports.getDataConsumerMark = function getDataConsumerMark(newNode) {
@@ -59,7 +58,7 @@ var getDataConsumerMark = exports.getDataConsumerMark = function getDataConsumer
   });
 };
 var getNodeTypesReferenced = exports.getNodeTypesReferenced = function getNodeTypesReferenced(ids, state) {
-  return (0, _nodesByLocalIds.findNodePosByLocalIds)(state, ids, {
+  return (0, _utils2.findNodePosByLocalIds)(state, ids, {
     includeDocNode: true
   }).map(function (_ref) {
     var node = _ref.node;
@@ -67,6 +66,6 @@ var getNodeTypesReferenced = exports.getNodeTypesReferenced = function getNodeTy
   });
 };
 var findNodePosWithLocalId = exports.findNodePosWithLocalId = function findNodePosWithLocalId(state, localId) {
-  var nodes = (0, _nodesByLocalIds.findNodePosByLocalIds)(state, [localId]);
+  var nodes = (0, _utils2.findNodePosByLocalIds)(state, [localId]);
   return nodes.length >= 1 ? nodes[0] : undefined;
 };

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

@@ -14,7 +14,7 @@ var _reducer = _interopRequireDefault(require("./reducer"));
 var _types = require("./types");
 var _utils = require("./utils");
 var _array = require("../../utils/array");
-var _step = require("../../utils/step");
+var _utils2 = require("@atlaskit/editor-common/utils");
 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; }
 var initialState = exports.initialState = {
@@ -33,7 +33,7 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
   if (!isActive || !findText) {
     return pluginState;
   }
-  if (!tr.steps.find(_step.stepHasSlice)) {
+  if (!tr.steps.find(_utils2.stepHasSlice)) {
     return pluginState;
   }
   var index = pluginState.index,
@@ -59,7 +59,7 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     // go through tr steps and find any new matches from user adding content or
     // any dead matches from user deleting content
     tr.steps.forEach(function (step) {
-      if ((0, _step.stepHasSlice)(step)) {
+      if ((0, _utils2.stepHasSlice)(step)) {
         // add all matches that are between the affected positions and don't already have
         // corresponding decorations
         matchesToAdd = [].concat((0, _toConsumableArray2.default)(matchesToAdd), (0, _toConsumableArray2.default)(newMatches.filter(function (match) {

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"));