@atlaskit/editor-core 185.2.24 → 185.2.25

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

@@ -5,7 +5,7 @@ import { createPlugin as createUniqueIdPlugin } from './pm-plugins/unique-id';
 import { getToolbarConfig } from './toolbar';
 import { getContextPanel } from './context-panel';
 const extensionPlugin = (options = {}, api) => {
-  var _api$dependencies, _api$dependencies$fea;
+  var _api$dependencies, _api$dependencies$fea, _api$dependencies$con2, _api$dependencies$con3;
   const 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()) || {};
   return {
     name: 'extension',
@@ -37,15 +37,22 @@ const extensionPlugin = (options = {}, api) => {
         }
       }, {
         name: 'extensionKeymap',
-        plugin: keymapPlugin
+        plugin: () => {
+          var _api$dependencies$con;
+          return keymapPlugin(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: () => createUniqueIdPlugin()
       }];
     },
     pluginsOptions: {
-      floatingToolbar: getToolbarConfig(options.breakoutEnabled, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
-      contextPanel: getContextPanel(options.allowAutoSave, featureFlags)
+      floatingToolbar: 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: 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/es2019/plugins/extension/pm-plugins/keymap.js

@@ -2,14 +2,14 @@ import { keymap } from 'prosemirror-keymap';
 import { getPluginState } from './main';
 import * as keymaps from '../../../keymaps';
 import { clearEditingContext } from '../commands';
-export default function keymapPlugin() {
+export default function keymapPlugin(applyChange) {
   const list = {};
   keymaps.bindKeymapWithCommand(keymaps.escape.common, (state, dispatch) => {
     const extensionState = getPluginState(state);
     if (!extensionState.showContextPanel) {
       return false;
     }
-    return clearEditingContext(state, dispatch);
+    return clearEditingContext(applyChange)(state, dispatch);
   }, list);
   return keymap(list);
 }

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

@@ -60,7 +60,8 @@ export const handleUpdate = ({
   view,
   prevState,
   domAtPos,
-  extensionHandlers
+  extensionHandlers,
+  applyChange
 }) => {
   const {
     state,
@@ -78,7 +79,7 @@ export const handleUpdate = ({
   const selectedExtension = getSelectedExtension(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
-      clearEditingContext(state, dispatch);
+      clearEditingContext(applyChange)(state, dispatch);
     }
     return;
   }
@@ -96,7 +97,7 @@ export const handleUpdate = ({
   element !== newElement;
   if (isNewNodeSelected || shouldUpdateEditButton) {
     if (showContextPanel) {
-      clearEditingContext(state, dispatch);
+      clearEditingContext(applyChange)(state, dispatch);
       return;
     }
     const {
@@ -126,9 +127,11 @@ export const handleUpdate = ({
   return true;
 };
 const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, pluginInjectionApi, useLongPressSelection = false, options = {}) => {
+  var _pluginInjectionApi$d;
   const state = 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
   });
   const extensionNodeViewOptions = {
     appearance: options.appearance
@@ -143,11 +146,13 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
       providerFactory.subscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
       return {
         update: (view, prevState) => {
+          var _pluginInjectionApi$d2;
           handleUpdate({
             view,
             prevState,
             domAtPos,
-            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: () => {

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

@@ -95,7 +95,7 @@ const breakoutOptions = (state, formatMessage, extensionState, breakoutEnabled)
   }
   return [];
 };
-const editButton = (formatMessage, extensionState) => {
+const editButton = (formatMessage, extensionState, applyChangeToContextPanel) => {
   if (!extensionState.showEditButton) {
     return [];
   }
@@ -110,7 +110,7 @@ const editButton = (formatMessage, extensionState) => {
       const {
         updateExtension
       } = getPluginState(state);
-      editExtension(macroState && macroState.macroProvider, updateExtension)(state, dispatch, view);
+      editExtension(macroState && macroState.macroProvider, applyChangeToContextPanel, updateExtension)(state, dispatch, view);
       return true;
     },
     title: formatMessage(messages.edit),
@@ -118,14 +118,18 @@ const editButton = (formatMessage, extensionState) => {
     focusEditoronEnter: true
   }];
 };
-export const getToolbarConfig = (breakoutEnabled = true, hoverDecoration) => (state, intl) => {
+export const getToolbarConfig = ({
+  breakoutEnabled = true,
+  hoverDecoration,
+  applyChangeToContextPanel
+}) => (state, intl) => {
   const {
     formatMessage
   } = intl;
   const extensionState = getPluginState(state);
   if (extensionState && !extensionState.showContextPanel && extensionState.element) {
     const nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension];
-    const editButtonArray = editButton(formatMessage, extensionState);
+    const editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel);
     const breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
     const extensionObj = getSelectedExtension(state, true);
 

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

@@ -21,7 +21,8 @@ const ExtensionButton = props => {
   const {
     item,
     node,
-    editorView
+    editorView,
+    applyChangeToContextPanel
   } = props;
   const ButtonIcon = React.useMemo(() => item.icon ? Loadable({
     loader: async () => resolveExtensionIcon(item.icon),
@@ -33,7 +34,8 @@ const ExtensionButton = props => {
     }
     const targetNodeAdf = nodeToJSON(node);
     const api = createExtensionAPI({
-      editorView
+      editorView,
+      applyChange: applyChangeToContextPanel
     });
     item.action(targetNodeAdf, api);
   };
@@ -53,7 +55,8 @@ export const ExtensionsPlaceholder = props => {
     node,
     editorView,
     extensionProvider,
-    separator
+    separator,
+    applyChangeToContextPanel
   } = props;
   const [extensions, setExtensions] = useState([]);
   useEffect(() => {
@@ -69,9 +72,10 @@ export const ExtensionsPlaceholder = props => {
   const nodeAdf = React.useMemo(() => nodeToJSON(node), [node]);
   const extensionItems = React.useMemo(() => {
     return getContextualToolbarItemsFromModule(extensions, nodeAdf, createExtensionAPI({
-      editorView
+      editorView,
+      applyChange: applyChangeToContextPanel
     }));
-  }, [extensions, nodeAdf, editorView]);
+  }, [extensions, nodeAdf, editorView, applyChangeToContextPanel]);
   if (!extensionItems.length) {
     return null;
   }
@@ -86,7 +90,8 @@ export const ExtensionsPlaceholder = props => {
     children.push( /*#__PURE__*/React.createElement(ExtensionButton, {
       node: node,
       item: item,
-      editorView: editorView
+      editorView: editorView,
+      applyChangeToContextPanel: applyChangeToContextPanel
     }));
     if (index < extensionItems.length - 1) {
       children.push( /*#__PURE__*/React.createElement(Separator, null));

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

@@ -41,7 +41,8 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
   node,
   setDisableScroll,
   mountRef,
-  featureFlags
+  featureFlags,
+  api
 }) => {
   const 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;
   const {
@@ -50,6 +51,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
     useSomewhatSemanticTextColorNames: false
   };
   return jsx(ButtonGroup, null, items.filter(item => !item.hidden).map((item, idx) => {
+    var _api$dependencies$con;
     switch (item.type) {
       case 'button':
         const ButtonIcon = item.icon;
@@ -205,7 +207,8 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           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 jsx(Separator, {

package/dist/es2019/plugins/index.js

@@ -52,7 +52,6 @@ export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as scrollIntoViewPlugin } from './scroll-into-view';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';
-export { default as contextPanelPlugin } from './context-panel';
 export { default as selectionPlugin } from './selection';
 export { default as mobileSelectionPlugin } from './mobile-selection';
 export { default as clipboardPlugin } from './clipboard';

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

@@ -8,7 +8,6 @@ import { N30 } from '@atlaskit/theme/colors';
 import { akEditorSwoopCubicBezier, akEditorDefaultLayoutWidth, akEditorWideLayoutWidth, akEditorBreakoutPadding, akEditorContextPanelWidth, ATLASSIAN_NAVIGATION_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import WithPluginState from '../WithPluginState';
-import { pluginKey as contextPanelPluginKey } from '../../plugins/context-panel';
 import WithEditorActions from '../WithEditorActions';
 import { getChildBreakoutModes } from '../../utils/document';
 import { WidthContext } from '@atlaskit/editor-common/ui';
@@ -167,6 +166,14 @@ const widthPluginKey = {
     return state['widthPlugin$'];
   }
 };
+
+// @ts-ignore
+const contextPanelPluginKey = {
+  key: 'contextPanelPluginKey$',
+  getState: state => {
+    return state['contextPanelPluginKey$'];
+  }
+};
 function ContextPanelWithActions({
   actions,
   ...props

package/dist/es2019/utils/action.js

@@ -6,7 +6,7 @@ export async function __temporaryFixForConfigPanel(editorView) {
   const extensionPluginState = editorView.state && extensionPluginKey.getState(editorView.state);
   if (extensionPluginState && extensionPluginState.showContextPanel) {
     await new Promise(resolve => {
-      forceAutoSave(resolve)(editorView.state, editorView.dispatch);
+      forceAutoSave(extensionPluginState.applyChangeToContextPanel)(resolve)(editorView.state, editorView.dispatch);
     });
   }
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.2.24";
+export const version = "185.2.25";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

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

@@ -2,7 +2,8 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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';
@@ -225,6 +226,11 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       }]);
     }
     return builder;
+  }).maybeAdd(contextPanelPlugin, function (plugin, builder) {
+    if (isFullPage) {
+      return builder.add(contextPanelPlugin);
+    }
+    return builder;
   }).maybeAdd(extensionPlugin, function (plugin, builder) {
     if (props.allowExtension) {
       var extensionConfig = _typeof(props.allowExtension) === 'object' ? props.allowExtension : {};
@@ -300,11 +306,6 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(contextPanelPlugin, function (plugin, builder) {
-    if (isFullPage) {
-      return builder.add(contextPanelPlugin);
-    }
-    return builder;
   }).maybeAdd(scrollIntoViewPlugin, function (plugin, builder) {
     if (props.autoScrollIntoView !== false) {
       return builder.add(scrollIntoViewPlugin);

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

@@ -150,10 +150,11 @@ export var updateExtensionParams = function updateExtensionParams(updateExtensio
 export var editSelectedExtension = function editSelectedExtension(editorActions) {
   var editorView = editorActions._privateGetEditorView();
   var _getPluginState = 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);
 };
-export var editExtension = function editExtension(macroProvider, updateExtension) {
+export var editExtension = function editExtension(macroProvider, applyChangeToContextPanel, updateExtension) {
   return function (state, dispatch, view) {
     if (!view) {
       return false;
@@ -173,7 +174,8 @@ export var editExtension = function editExtension(macroProvider, updateExtension
         if (updateMethod && view) {
           var actions = createExtensionAPI({
             editorView: view,
-            editInLegacyMacroBrowser: editInLegacyMacroBrowser
+            editInLegacyMacroBrowser: editInLegacyMacroBrowser,
+            applyChange: applyChangeToContextPanel
           });
           updateExtensionParams(updateMethod, nodeWithPos, actions)(state, dispatch, view);
           return;

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

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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';
@@ -14,7 +13,7 @@ export function updateState(state) {
     data: state
   });
 }
-export function setEditingContextToContextPanel(processParametersBefore, processParametersAfter) {
+export function setEditingContextToContextPanel(processParametersBefore, processParametersAfter, applyChangeToContextPanel) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
@@ -22,24 +21,28 @@ export function setEditingContextToContextPanel(processParametersBefore, process
       processParametersBefore: processParametersBefore,
       processParametersAfter: processParametersAfter
     }
-  }, applyChange);
+  }, applyChangeToContextPanel);
 }
-export var clearEditingContext = createCommand({
-  type: 'UPDATE_STATE',
-  data: {
-    showContextPanel: false,
-    processParametersBefore: undefined,
-    processParametersAfter: undefined
-  }
-}, applyChange);
-export var forceAutoSave = function forceAutoSave(resolve, reject) {
+export var clearEditingContext = function clearEditingContext(applyChangeToContextPanel) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
-      autoSaveResolve: resolve,
-      autoSaveReject: reject
+      showContextPanel: false,
+      processParametersBefore: undefined,
+      processParametersAfter: undefined
     }
-  }, applyChange);
+  }, applyChangeToContextPanel);
+};
+export var forceAutoSave = function forceAutoSave(applyChangeToContextPanel) {
+  return function (resolve, reject) {
+    return createCommand({
+      type: 'UPDATE_STATE',
+      data: {
+        autoSaveResolve: resolve,
+        autoSaveReject: reject
+      }
+    }, applyChangeToContextPanel);
+  };
 };
 export var updateExtensionLayout = function updateExtensionLayout(layout) {
   return createCommand({

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

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

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

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

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

@@ -5,7 +5,7 @@ import { createPlugin as createUniqueIdPlugin } from './pm-plugins/unique-id';
 import { getToolbarConfig } from './toolbar';
 import { getContextPanel } from './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()) || {};
@@ -38,7 +38,10 @@ var extensionPlugin = function extensionPlugin() {
         }
       }, {
         name: 'extensionKeymap',
-        plugin: keymapPlugin
+        plugin: function plugin() {
+          var _api$dependencies$con;
+          return keymapPlugin(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() {
@@ -47,8 +50,12 @@ var extensionPlugin = function extensionPlugin() {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: getToolbarConfig(options.breakoutEnabled, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
-      contextPanel: getContextPanel(options.allowAutoSave, featureFlags)
+      floatingToolbar: 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: 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/esm/plugins/extension/pm-plugins/keymap.js

@@ -2,14 +2,14 @@ import { keymap } from 'prosemirror-keymap';
 import { getPluginState } from './main';
 import * as keymaps from '../../../keymaps';
 import { clearEditingContext } from '../commands';
-export default function keymapPlugin() {
+export default function keymapPlugin(applyChange) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.escape.common, function (state, dispatch) {
     var extensionState = getPluginState(state);
     if (!extensionState.showContextPanel) {
       return false;
     }
-    return clearEditingContext(state, dispatch);
+    return clearEditingContext(applyChange)(state, dispatch);
   }, list);
   return keymap(list);
 }

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

@@ -137,7 +137,8 @@ export 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 = getPluginState(state),
@@ -151,7 +152,7 @@ export var handleUpdate = function handleUpdate(_ref4) {
   var selectedExtension = getSelectedExtension(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
-      clearEditingContext(state, dispatch);
+      clearEditingContext(applyChange)(state, dispatch);
     }
     return;
   }
@@ -167,7 +168,7 @@ export var handleUpdate = function handleUpdate(_ref4) {
   element !== newElement;
   if (isNewNodeSelected || shouldUpdateEditButton) {
     if (showContextPanel) {
-      clearEditingContext(state, dispatch);
+      clearEditingContext(applyChange)(state, dispatch);
       return;
     }
     var extensionType = node.attrs.extensionType;
@@ -195,11 +196,13 @@ export var handleUpdate = function handleUpdate(_ref4) {
   return true;
 };
 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 = 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
@@ -214,11 +217,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/esm/plugins/extension/toolbar.js

@@ -89,7 +89,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 [];
   }
@@ -103,7 +103,7 @@ var editButton = function editButton(formatMessage, extensionState) {
       var macroState = macroPluginKey.getState(state);
       var _getPluginState = getPluginState(state),
         updateExtension = _getPluginState.updateExtension;
-      editExtension(macroState && macroState.macroProvider, updateExtension)(state, dispatch, view);
+      editExtension(macroState && macroState.macroProvider, applyChangeToContextPanel, updateExtension)(state, dispatch, view);
       return true;
     },
     title: formatMessage(messages.edit),
@@ -111,15 +111,17 @@ var editButton = function editButton(formatMessage, extensionState) {
     focusEditoronEnter: true
   }];
 };
-export var getToolbarConfig = function getToolbarConfig() {
-  var breakoutEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
+export 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 = 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 = getSelectedExtension(state, true);