@atlaskit/editor-core 185.2.24 → 185.2.25

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 185.2.25
+
+### Patch Changes
+
+- [`87366c84531`](https://bitbucket.org/atlassian/atlassian-frontend/commits/87366c84531) - Extract context panel plugin to new package @atlaskit/editor-plugin-context-panel
+- Updated dependencies
+
 ## 185.2.24
 
 ### Patch Changes

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

@@ -8,6 +8,7 @@ exports.default = createUniversalPreset;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _plugins = require("../../../plugins");
+var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
 var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
 var _card = _interopRequireDefault(require("../../../plugins/card"));
 var _editorPluginTable = require("@atlaskit/editor-plugin-table");
@@ -232,6 +233,11 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
+  }).maybeAdd(_editorPluginContextPanel.contextPanelPlugin, function (plugin, builder) {
+    if (isFullPage) {
+      return builder.add(_editorPluginContextPanel.contextPanelPlugin);
+    }
+    return builder;
   }).maybeAdd(_plugins.extensionPlugin, function (plugin, builder) {
     if (props.allowExtension) {
       var extensionConfig = (0, _typeof2.default)(props.allowExtension) === 'object' ? props.allowExtension : {};
@@ -307,11 +313,6 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(_plugins.contextPanelPlugin, function (plugin, builder) {
-    if (isFullPage) {
-      return builder.add(_plugins.contextPanelPlugin);
-    }
-    return builder;
   }).maybeAdd(_plugins.scrollIntoViewPlugin, function (plugin, builder) {
     if (props.autoScrollIntoView !== false) {
       return builder.add(_plugins.scrollIntoViewPlugin);

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

@@ -167,11 +167,12 @@ exports.updateExtensionParams = updateExtensionParams;
 var editSelectedExtension = function editSelectedExtension(editorActions) {
   var editorView = editorActions._privateGetEditorView();
   var _getPluginState = (0, _main.getPluginState)(editorView.state),
-    updateExtension = _getPluginState.updateExtension;
-  return editExtension(null, updateExtension)(editorView.state, editorView.dispatch, editorView);
+    updateExtension = _getPluginState.updateExtension,
+    applyChangeToContextPanel = _getPluginState.applyChangeToContextPanel;
+  return editExtension(null, applyChangeToContextPanel, updateExtension)(editorView.state, editorView.dispatch, editorView);
 };
 exports.editSelectedExtension = editSelectedExtension;
-var editExtension = function editExtension(macroProvider, updateExtension) {
+var editExtension = function editExtension(macroProvider, applyChangeToContextPanel, updateExtension) {
   return function (state, dispatch, view) {
     if (!view) {
       return false;
@@ -191,7 +192,8 @@ var editExtension = function editExtension(macroProvider, updateExtension) {
         if (updateMethod && view) {
           var actions = (0, _extensionApi.createExtensionAPI)({
             editorView: view,
-            editInLegacyMacroBrowser: editInLegacyMacroBrowser
+            editInLegacyMacroBrowser: editInLegacyMacroBrowser,
+            applyChange: applyChangeToContextPanel
           });
           updateExtensionParams(updateMethod, nodeWithPos, actions)(state, dispatch, view);
           return;

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

@@ -10,7 +10,6 @@ exports.updateExtensionLayout = void 0;
 exports.updateState = updateState;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _prosemirrorUtils = require("prosemirror-utils");
-var _transforms = require("../context-panel/transforms");
 var _pluginFactory = require("./plugin-factory");
 var _utils = require("./utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
@@ -25,7 +24,7 @@ function updateState(state) {
     data: state
   });
 }
-function setEditingContextToContextPanel(processParametersBefore, processParametersAfter) {
+function setEditingContextToContextPanel(processParametersBefore, processParametersAfter, applyChangeToContextPanel) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
@@ -33,25 +32,29 @@ function setEditingContextToContextPanel(processParametersBefore, processParamet
       processParametersBefore: processParametersBefore,
       processParametersAfter: processParametersAfter
     }
-  }, _transforms.applyChange);
+  }, applyChangeToContextPanel);
 }
-var clearEditingContext = (0, _pluginFactory.createCommand)({
-  type: 'UPDATE_STATE',
-  data: {
-    showContextPanel: false,
-    processParametersBefore: undefined,
-    processParametersAfter: undefined
-  }
-}, _transforms.applyChange);
-exports.clearEditingContext = clearEditingContext;
-var forceAutoSave = function forceAutoSave(resolve, reject) {
+var clearEditingContext = function clearEditingContext(applyChangeToContextPanel) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
-      autoSaveResolve: resolve,
-      autoSaveReject: reject
+      showContextPanel: false,
+      processParametersBefore: undefined,
+      processParametersAfter: undefined
     }
-  }, _transforms.applyChange);
+  }, applyChangeToContextPanel);
+};
+exports.clearEditingContext = clearEditingContext;
+var forceAutoSave = function forceAutoSave(applyChangeToContextPanel) {
+  return function (resolve, reject) {
+    return (0, _pluginFactory.createCommand)({
+      type: 'UPDATE_STATE',
+      data: {
+        autoSaveResolve: resolve,
+        autoSaveReject: reject
+      }
+    }, applyChangeToContextPanel);
+  };
 };
 exports.forceAutoSave = forceAutoSave;
 var updateExtensionLayout = function updateExtensionLayout(layout) {

package/dist/cjs/plugins/extension/context-panel.js

@@ -33,7 +33,7 @@ var areParametersEqual = function areParametersEqual(firstParameters, secondPara
   }
   return firstParameters === secondParameters;
 };
-var getContextPanel = function getContextPanel(allowAutoSave, featureFlags) {
+var getContextPanel = function getContextPanel(allowAutoSave, featureFlags, applyChange) {
   return function (state) {
     var nodeWithPos = (0, _utils.getSelectedExtension)(state, true);
 
@@ -95,7 +95,7 @@ var getContextPanel = function getContextPanel(allowAutoSave, featureFlags) {
                           autoSaveResolve();
                         }
                         if (!allowAutoSave) {
-                          (0, _commands.clearEditingContext)(editorView.state, editorView.dispatch);
+                          (0, _commands.clearEditingContext)(applyChange)(editorView.state, editorView.dispatch);
                         }
                       case 5:
                       case "end":
@@ -118,7 +118,7 @@ var getContextPanel = function getContextPanel(allowAutoSave, featureFlags) {
                       _context2.prev = 1;
                       _context2.next = 4;
                       return new Promise(function (resolve, reject) {
-                        (0, _commands.forceAutoSave)(resolve, reject)(editorView.state, editorView.dispatch);
+                        (0, _commands.forceAutoSave)(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
                       });
                     case 4:
                       _context2.next = 9;
@@ -130,7 +130,7 @@ var getContextPanel = function getContextPanel(allowAutoSave, featureFlags) {
                       // eslint-disable-next-line no-console
                       console.error("Autosave failed with error", _context2.t0);
                     case 9:
-                      (0, _commands.clearEditingContext)(editorView.state, editorView.dispatch);
+                      (0, _commands.clearEditingContext)(applyChange)(editorView.state, editorView.dispatch);
                     case 10:
                     case "end":
                       return _context2.stop();

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

@@ -245,7 +245,7 @@ var createExtensionAPI = function createExtensionAPI(options) {
   return {
     editInContextPanel: function editInContextPanel(transformBefore, transformAfter) {
       var editorView = options.editorView;
-      (0, _commands.setEditingContextToContextPanel)(transformBefore, transformAfter)(editorView.state, editorView.dispatch, editorView);
+      (0, _commands.setEditingContextToContextPanel)(transformBefore, transformAfter, options.applyChange)(editorView.state, editorView.dispatch, editorView);
     },
     _editInLegacyMacroBrowser: function _editInLegacyMacroBrowser() {
       var editorView = options.editorView;

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

@@ -12,7 +12,7 @@ var _uniqueId = require("./pm-plugins/unique-id");
 var _toolbar = require("./toolbar");
 var _contextPanel = require("./context-panel");
 var extensionPlugin = function extensionPlugin() {
-  var _api$dependencies, _api$dependencies$fea;
+  var _api$dependencies, _api$dependencies$fea, _api$dependencies$con2, _api$dependencies$con3;
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var api = arguments.length > 1 ? arguments[1] : undefined;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
@@ -45,7 +45,10 @@ var extensionPlugin = function extensionPlugin() {
         }
       }, {
         name: 'extensionKeymap',
-        plugin: _keymap.default
+        plugin: function plugin() {
+          var _api$dependencies$con;
+          return (0, _keymap.default)(api === null || api === void 0 ? void 0 : (_api$dependencies$con = api.dependencies.contextPanel) === null || _api$dependencies$con === void 0 ? void 0 : _api$dependencies$con.actions.applyChange);
+        }
       }, {
         name: 'extensionUniqueId',
         plugin: function plugin() {
@@ -54,8 +57,12 @@ var extensionPlugin = function extensionPlugin() {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(options.breakoutEnabled, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
-      contextPanel: (0, _contextPanel.getContextPanel)(options.allowAutoSave, featureFlags)
+      floatingToolbar: (0, _toolbar.getToolbarConfig)({
+        breakoutEnabled: options.breakoutEnabled,
+        hoverDecoration: api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration,
+        applyChangeToContextPanel: api === null || api === void 0 ? void 0 : (_api$dependencies$con2 = api.dependencies.contextPanel) === null || _api$dependencies$con2 === void 0 ? void 0 : _api$dependencies$con2.actions.applyChange
+      }),
+      contextPanel: (0, _contextPanel.getContextPanel)(options.allowAutoSave, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$con3 = api.dependencies.contextPanel) === null || _api$dependencies$con3 === void 0 ? void 0 : _api$dependencies$con3.actions.applyChange)
     }
   };
 };

package/dist/cjs/plugins/extension/pm-plugins/keymap.js

@@ -11,14 +11,14 @@ var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _commands = require("../commands");
 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 || _typeof(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; }
-function keymapPlugin() {
+function keymapPlugin(applyChange) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.escape.common, function (state, dispatch) {
     var extensionState = (0, _main.getPluginState)(state);
     if (!extensionState.showContextPanel) {
       return false;
     }
-    return (0, _commands.clearEditingContext)(state, dispatch);
+    return (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
   }, list);
   return (0, _prosemirrorKeymap.keymap)(list);
 }

package/dist/cjs/plugins/extension/pm-plugins/main.js

@@ -165,7 +165,8 @@ var handleUpdate = function handleUpdate(_ref4) {
   var view = _ref4.view,
     prevState = _ref4.prevState,
     domAtPos = _ref4.domAtPos,
-    extensionHandlers = _ref4.extensionHandlers;
+    extensionHandlers = _ref4.extensionHandlers,
+    applyChange = _ref4.applyChange;
   var state = view.state,
     dispatch = view.dispatch;
   var _getPluginState = (0, _pluginFactory.getPluginState)(state),
@@ -179,7 +180,7 @@ var handleUpdate = function handleUpdate(_ref4) {
   var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
-      (0, _commands.clearEditingContext)(state, dispatch);
+      (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
     }
     return;
   }
@@ -195,7 +196,7 @@ var handleUpdate = function handleUpdate(_ref4) {
   element !== newElement;
   if (isNewNodeSelected || shouldUpdateEditButton) {
     if (showContextPanel) {
-      (0, _commands.clearEditingContext)(state, dispatch);
+      (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
       return;
     }
     var extensionType = node.attrs.extensionType;
@@ -224,11 +225,13 @@ var handleUpdate = function handleUpdate(_ref4) {
 };
 exports.handleUpdate = handleUpdate;
 var createPlugin = function createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, pluginInjectionApi) {
+  var _pluginInjectionApi$d;
   var useLongPressSelection = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var options = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : {};
   var state = (0, _pluginFactory.createPluginState)(dispatch, {
     showEditButton: false,
-    showContextPanel: false
+    showContextPanel: false,
+    applyChangeToContextPanel: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.contextPanel) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.applyChange
   });
   var extensionNodeViewOptions = {
     appearance: options.appearance
@@ -243,11 +246,13 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
       providerFactory.subscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
       return {
         update: function update(view, prevState) {
+          var _pluginInjectionApi$d2;
           handleUpdate({
             view: view,
             prevState: prevState,
             domAtPos: domAtPos,
-            extensionHandlers: extensionHandlers
+            extensionHandlers: extensionHandlers,
+            applyChange: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.contextPanel) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.applyChange
           });
         },
         destroy: function destroy() {

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

@@ -97,7 +97,7 @@ var breakoutOptions = function breakoutOptions(state, formatMessage, extensionSt
   }
   return [];
 };
-var editButton = function editButton(formatMessage, extensionState) {
+var editButton = function editButton(formatMessage, extensionState, applyChangeToContextPanel) {
   if (!extensionState.showEditButton) {
     return [];
   }
@@ -111,7 +111,7 @@ var editButton = function editButton(formatMessage, extensionState) {
       var macroState = _pluginKey.pluginKey.getState(state);
       var _getPluginState = (0, _main.getPluginState)(state),
         updateExtension = _getPluginState.updateExtension;
-      (0, _actions.editExtension)(macroState && macroState.macroProvider, updateExtension)(state, dispatch, view);
+      (0, _actions.editExtension)(macroState && macroState.macroProvider, applyChangeToContextPanel, updateExtension)(state, dispatch, view);
       return true;
     },
     title: formatMessage(messages.edit),
@@ -119,15 +119,17 @@ var editButton = function editButton(formatMessage, extensionState) {
     focusEditoronEnter: true
   }];
 };
-var getToolbarConfig = function getToolbarConfig() {
-  var breakoutEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
+var getToolbarConfig = function getToolbarConfig(_ref) {
+  var _ref$breakoutEnabled = _ref.breakoutEnabled,
+    breakoutEnabled = _ref$breakoutEnabled === void 0 ? true : _ref$breakoutEnabled,
+    hoverDecoration = _ref.hoverDecoration,
+    applyChangeToContextPanel = _ref.applyChangeToContextPanel;
   return function (state, intl) {
     var formatMessage = intl.formatMessage;
     var extensionState = (0, _main.getPluginState)(state);
     if (extensionState && !extensionState.showContextPanel && extensionState.element) {
       var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension];
-      var editButtonArray = editButton(formatMessage, extensionState);
+      var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel);
       var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
       var extensionObj = (0, _utils.getSelectedExtension)(state, true);
 

package/dist/cjs/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js

@@ -55,7 +55,8 @@ var resolveExtensionIcon = /*#__PURE__*/function () {
 var ExtensionButton = function ExtensionButton(props) {
   var item = props.item,
     node = props.node,
-    editorView = props.editorView;
+    editorView = props.editorView,
+    applyChangeToContextPanel = props.applyChangeToContextPanel;
   var ButtonIcon = _react.default.useMemo(function () {
     return item.icon ? (0, _reactLoadable.default)({
       loader: function () {
@@ -84,7 +85,8 @@ var ExtensionButton = function ExtensionButton(props) {
     }
     var targetNodeAdf = (0, _utils.nodeToJSON)(node);
     var api = (0, _extensionApi.createExtensionAPI)({
-      editorView: editorView
+      editorView: editorView,
+      applyChange: applyChangeToContextPanel
     });
     item.action(targetNodeAdf, api);
   };
@@ -103,7 +105,8 @@ var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
   var node = props.node,
     editorView = props.editorView,
     extensionProvider = props.extensionProvider,
-    separator = props.separator;
+    separator = props.separator,
+    applyChangeToContextPanel = props.applyChangeToContextPanel;
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     extensions = _useState2[0],
@@ -141,9 +144,10 @@ var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
   }, [node]);
   var extensionItems = _react.default.useMemo(function () {
     return (0, _extensions.getContextualToolbarItemsFromModule)(extensions, nodeAdf, (0, _extensionApi.createExtensionAPI)({
-      editorView: editorView
+      editorView: editorView,
+      applyChange: applyChangeToContextPanel
     }));
-  }, [extensions, nodeAdf, editorView]);
+  }, [extensions, nodeAdf, editorView, applyChangeToContextPanel]);
   if (!extensionItems.length) {
     return null;
   }
@@ -158,7 +162,8 @@ var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
     children.push( /*#__PURE__*/_react.default.createElement(ExtensionButton, {
       node: node,
       item: item,
-      editorView: editorView
+      editorView: editorView,
+      applyChangeToContextPanel: applyChangeToContextPanel
     }));
     if (index < extensionItems.length - 1) {
       children.push( /*#__PURE__*/_react.default.createElement(_Separator.default, null));

package/dist/cjs/plugins/floating-toolbar/ui/Toolbar.js

@@ -60,7 +60,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
     node = _ref.node,
     setDisableScroll = _ref.setDisableScroll,
     mountRef = _ref.mountRef,
-    featureFlags = _ref.featureFlags;
+    featureFlags = _ref.featureFlags,
+    api = _ref.api;
   var emojiAndColourPickerMountPoint = scrollable ? popupsMountPoint || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.fabric-editor-popup-scroll-parent')) || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.ak-editor-content-area')) || undefined : popupsMountPoint;
   var _ref2 = featureFlags || {
       useSomewhatSemanticTextColorNames: false
@@ -69,6 +70,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
   return (0, _react2.jsx)(_buttonGroup.default, null, items.filter(function (item) {
     return !item.hidden;
   }).map(function (item, idx) {
+    var _api$dependencies$con;
     switch (item.type) {
       case 'button':
         var ButtonIcon = item.icon;
@@ -239,7 +241,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           node: node,
           editorView: editorView,
           extensionProvider: extensionsProvider,
-          separator: item.separator
+          separator: item.separator,
+          applyChangeToContextPanel: api === null || api === void 0 ? void 0 : (_api$dependencies$con = api.dependencies.contextPanel) === null || _api$dependencies$con === void 0 ? void 0 : _api$dependencies$con.actions.applyChange
         });
       case 'separator':
         return (0, _react2.jsx)(_Separator.default, {

package/dist/cjs/plugins/index.js

@@ -107,12 +107,6 @@ Object.defineProperty(exports, "collabEditPlugin", {
     return _collabEdit.default;
   }
 });
-Object.defineProperty(exports, "contextPanelPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _contextPanel.default;
-  }
-});
 Object.defineProperty(exports, "copyButtonPlugin", {
   enumerable: true,
   get: function get() {
@@ -454,7 +448,6 @@ var _expand = _interopRequireWildcard(require("./expand"));
 var _scrollIntoView = _interopRequireDefault(require("./scroll-into-view"));
 var _mobileDimensions = _interopRequireDefault(require("./mobile-dimensions"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));
-var _contextPanel = _interopRequireDefault(require("./context-panel"));
 var _selection = _interopRequireDefault(require("./selection"));
 var _mobileSelection = _interopRequireDefault(require("./mobile-selection"));
 var _clipboard = _interopRequireDefault(require("./clipboard"));

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

@@ -25,7 +25,6 @@ var _colors = require("@atlaskit/theme/colors");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _WithPluginState = _interopRequireDefault(require("../WithPluginState"));
-var _contextPanel = require("../../plugins/context-panel");
 var _WithEditorActions = _interopRequireDefault(require("../WithEditorActions"));
 var _document = require("../../utils/document");
 var _excluded = ["actions"];
@@ -183,6 +182,14 @@ var widthPluginKey = {
     return state['widthPlugin$'];
   }
 };
+
+// @ts-ignore
+var contextPanelPluginKey = {
+  key: 'contextPanelPluginKey$',
+  getState: function getState(state) {
+    return state['contextPanelPluginKey$'];
+  }
+};
 function ContextPanelWithActions(_ref2) {
   var actions = _ref2.actions,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
@@ -198,7 +205,7 @@ function ContextPanelWithActions(_ref2) {
   return (0, _react2.jsx)(_WithPluginState.default, {
     eventDispatcher: eventDispatcher,
     plugins: {
-      contextPanel: _contextPanel.pluginKey,
+      contextPanel: contextPanelPluginKey,
       widthState: widthPluginKey
     },
     render: function render(_ref3) {

package/dist/cjs/utils/action.js

@@ -29,7 +29,7 @@ function _temporaryFixForConfigPanel() {
           }
           _context.next = 4;
           return new Promise(function (resolve) {
-            (0, _commands.forceAutoSave)(resolve)(editorView.state, editorView.dispatch);
+            (0, _commands.forceAutoSave)(extensionPluginState.applyChangeToContextPanel)(resolve)(editorView.state, editorView.dispatch);
           });
         case 4:
         case "end":

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "185.2.24";
+var version = "185.2.25";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.2.24",
+	"version": "185.2.25",
 	"sideEffects": false
 }

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

@@ -1,4 +1,5 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
+import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
 import cardPlugin from '../../../plugins/card';
 import { tablesPlugin } from '@atlaskit/editor-plugin-table';
@@ -227,6 +228,11 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       }]);
     }
     return builder;
+  }).maybeAdd(contextPanelPlugin, (plugin, builder) => {
+    if (isFullPage) {
+      return builder.add(contextPanelPlugin);
+    }
+    return builder;
   }).maybeAdd(extensionPlugin, (plugin, builder) => {
     if (props.allowExtension) {
       const extensionConfig = typeof props.allowExtension === 'object' ? props.allowExtension : {};
@@ -306,11 +312,6 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(contextPanelPlugin, (plugin, builder) => {
-    if (isFullPage) {
-      return builder.add(contextPanelPlugin);
-    }
-    return builder;
   }).maybeAdd(scrollIntoViewPlugin, (plugin, builder) => {
     if (props.autoScrollIntoView !== false) {
       return builder.add(scrollIntoViewPlugin);

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

@@ -132,11 +132,12 @@ export const updateExtensionParams = (updateExtension, node, actions) => async (
 export const editSelectedExtension = editorActions => {
   const editorView = editorActions._privateGetEditorView();
   const {
-    updateExtension
+    updateExtension,
+    applyChangeToContextPanel
   } = getPluginState(editorView.state);
-  return editExtension(null, updateExtension)(editorView.state, editorView.dispatch, editorView);
+  return editExtension(null, applyChangeToContextPanel, updateExtension)(editorView.state, editorView.dispatch, editorView);
 };
-export const editExtension = (macroProvider, updateExtension) => (state, dispatch, view) => {
+export const editExtension = (macroProvider, applyChangeToContextPanel, updateExtension) => (state, dispatch, view) => {
   if (!view) {
     return false;
   }
@@ -156,7 +157,8 @@ export const editExtension = (macroProvider, updateExtension) => (state, dispatc
       if (updateMethod && view) {
         const actions = createExtensionAPI({
           editorView: view,
-          editInLegacyMacroBrowser
+          editInLegacyMacroBrowser,
+          applyChange: applyChangeToContextPanel
         });
         updateExtensionParams(updateMethod, nodeWithPos, actions)(state, dispatch, view);
         return;

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

@@ -1,5 +1,4 @@
 import { removeSelectedNode, removeParentNodeOfType } from 'prosemirror-utils';
-import { applyChange } from '../context-panel/transforms';
 import { createCommand } from './plugin-factory';
 import { getSelectedExtension } from './utils';
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
@@ -11,7 +10,7 @@ export function updateState(state) {
     data: state
   });
 }
-export function setEditingContextToContextPanel(processParametersBefore, processParametersAfter) {
+export function setEditingContextToContextPanel(processParametersBefore, processParametersAfter, applyChangeToContextPanel) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
@@ -19,23 +18,23 @@ export function setEditingContextToContextPanel(processParametersBefore, process
       processParametersBefore,
       processParametersAfter
     }
-  }, applyChange);
+  }, applyChangeToContextPanel);
 }
-export const clearEditingContext = createCommand({
+export const clearEditingContext = applyChangeToContextPanel => createCommand({
   type: 'UPDATE_STATE',
   data: {
     showContextPanel: false,
     processParametersBefore: undefined,
     processParametersAfter: undefined
   }
-}, applyChange);
-export const forceAutoSave = (resolve, reject) => createCommand({
+}, applyChangeToContextPanel);
+export const forceAutoSave = applyChangeToContextPanel => (resolve, reject) => createCommand({
   type: 'UPDATE_STATE',
   data: {
     autoSaveResolve: resolve,
     autoSaveReject: reject
   }
-}, applyChange);
+}, applyChangeToContextPanel);
 export const updateExtensionLayout = layout => createCommand({
   type: 'UPDATE_STATE',
   data: {

package/dist/es2019/plugins/extension/context-panel.js

@@ -16,7 +16,7 @@ const areParametersEqual = (firstParameters, secondParameters) => {
   }
   return firstParameters === secondParameters;
 };
-export const getContextPanel = (allowAutoSave, featureFlags) => state => {
+export const getContextPanel = (allowAutoSave, featureFlags, applyChange) => state => {
   const nodeWithPos = getSelectedExtension(state, true);
 
   // Adding checks to bail out early
@@ -72,14 +72,14 @@ export const getContextPanel = (allowAutoSave, featureFlags) => state => {
                 autoSaveResolve();
               }
               if (!allowAutoSave) {
-                clearEditingContext(editorView.state, editorView.dispatch);
+                clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
               }
             },
             onCancel: async () => {
               if (allowAutoSave) {
                 try {
                   await new Promise((resolve, reject) => {
-                    forceAutoSave(resolve, reject)(editorView.state, editorView.dispatch);
+                    forceAutoSave(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
                   });
                 } catch (e) {
                   // Even if the save failed, we should proceed with closing the panel
@@ -87,7 +87,7 @@ export const getContextPanel = (allowAutoSave, featureFlags) => state => {
                   console.error(`Autosave failed with error`, e);
                 }
               }
-              clearEditingContext(editorView.state, editorView.dispatch);
+              clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
             },
             featureFlags: featureFlags
           });

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

@@ -260,7 +260,7 @@ export const createExtensionAPI = options => {
       const {
         editorView
       } = options;
-      setEditingContextToContextPanel(transformBefore, transformAfter)(editorView.state, editorView.dispatch, editorView);
+      setEditingContextToContextPanel(transformBefore, transformAfter, options.applyChange)(editorView.state, editorView.dispatch, editorView);
     },
     _editInLegacyMacroBrowser: () => {
       const {