@atlaskit/editor-core 185.2.23 → 185.2.25

package/dist/es2019/editor-next/hooks/useProviderFactory.js

@@ -17,7 +17,6 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
 /**
  *
  * This hook is used to create the provider factory object.
- * WARNING: Consider any changes to also make to `src/editor.tsx`
  *
  * @param props
  * @param editorActions
@@ -27,7 +26,23 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
 export default function useProviderFactory(props, editorActions, createAnalyticsEvent) {
   const {
     extensionProviders,
-    quickInsert
+    quickInsert,
+    linking,
+    smartLinks,
+    UNSAFE_cards,
+    autoformattingProvider,
+    media,
+    emojiProvider,
+    mentionProvider,
+    legacyImageUploadProvider,
+    taskDecisionProvider,
+    contextIdentifierProvider,
+    searchProvider,
+    macroProvider,
+    activityProvider,
+    collabEdit,
+    collabEditProvider,
+    presenceProvider
   } = props;
   const providerFactory = useRef(new ProviderFactory());
   const [providerState, setProviderState] = useState(createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent));
@@ -43,11 +58,45 @@ export default function useProviderFactory(props, editorActions, createAnalytics
     quickInsert && quickInsert !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert)) {
       const newState = createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent);
       setProviderState(newState);
-      handleProviders(providerFactory.current, getProvidersFromEditorProps(props), newState.extensionProvider, newState.quickInsertProvider);
+      handleProviders(providerFactory.current, getProvidersFromEditorProps({
+        linking,
+        smartLinks,
+        UNSAFE_cards,
+        autoformattingProvider,
+        media,
+        emojiProvider,
+        mentionProvider,
+        legacyImageUploadProvider,
+        taskDecisionProvider,
+        contextIdentifierProvider,
+        searchProvider,
+        macroProvider,
+        activityProvider,
+        collabEdit,
+        collabEditProvider,
+        presenceProvider
+      }), newState.extensionProvider, newState.quickInsertProvider);
       return;
     }
-    handleProviders(providerFactory.current, getProvidersFromEditorProps(props), providerState.extensionProvider, providerState.quickInsertProvider);
-  }, [props, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
+    handleProviders(providerFactory.current, getProvidersFromEditorProps({
+      linking,
+      smartLinks,
+      UNSAFE_cards,
+      autoformattingProvider,
+      media,
+      emojiProvider,
+      mentionProvider,
+      legacyImageUploadProvider,
+      taskDecisionProvider,
+      contextIdentifierProvider,
+      searchProvider,
+      macroProvider,
+      activityProvider,
+      collabEdit,
+      collabEditProvider,
+      presenceProvider
+    }), providerState.extensionProvider, providerState.quickInsertProvider);
+  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
 
   // componentWillUnmount equivalent
   useEffect(() => {

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 {

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.23";
+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.23",
+	"version": "185.2.25",
 	"sideEffects": false
 }

package/dist/esm/editor-next/hooks/useProviderFactory.js

@@ -20,7 +20,6 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
 /**
  *
  * This hook is used to create the provider factory object.
- * WARNING: Consider any changes to also make to `src/editor.tsx`
  *
  * @param props
  * @param editorActions
@@ -29,7 +28,23 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
  */
 export default function useProviderFactory(props, editorActions, createAnalyticsEvent) {
   var extensionProviders = props.extensionProviders,
-    quickInsert = props.quickInsert;
+    quickInsert = props.quickInsert,
+    linking = props.linking,
+    smartLinks = props.smartLinks,
+    UNSAFE_cards = props.UNSAFE_cards,
+    autoformattingProvider = props.autoformattingProvider,
+    media = props.media,
+    emojiProvider = props.emojiProvider,
+    mentionProvider = props.mentionProvider,
+    legacyImageUploadProvider = props.legacyImageUploadProvider,
+    taskDecisionProvider = props.taskDecisionProvider,
+    contextIdentifierProvider = props.contextIdentifierProvider,
+    searchProvider = props.searchProvider,
+    macroProvider = props.macroProvider,
+    activityProvider = props.activityProvider,
+    collabEdit = props.collabEdit,
+    collabEditProvider = props.collabEditProvider,
+    presenceProvider = props.presenceProvider;
   var providerFactory = useRef(new ProviderFactory());
   var _useState = useState(createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -47,11 +62,45 @@ export default function useProviderFactory(props, editorActions, createAnalytics
     quickInsert && quickInsert !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert)) {
       var newState = createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent);
       setProviderState(newState);
-      handleProviders(providerFactory.current, getProvidersFromEditorProps(props), newState.extensionProvider, newState.quickInsertProvider);
+      handleProviders(providerFactory.current, getProvidersFromEditorProps({
+        linking: linking,
+        smartLinks: smartLinks,
+        UNSAFE_cards: UNSAFE_cards,
+        autoformattingProvider: autoformattingProvider,
+        media: media,
+        emojiProvider: emojiProvider,
+        mentionProvider: mentionProvider,
+        legacyImageUploadProvider: legacyImageUploadProvider,
+        taskDecisionProvider: taskDecisionProvider,
+        contextIdentifierProvider: contextIdentifierProvider,
+        searchProvider: searchProvider,
+        macroProvider: macroProvider,
+        activityProvider: activityProvider,
+        collabEdit: collabEdit,
+        collabEditProvider: collabEditProvider,
+        presenceProvider: presenceProvider
+      }), newState.extensionProvider, newState.quickInsertProvider);
       return;
     }
-    handleProviders(providerFactory.current, getProvidersFromEditorProps(props), providerState.extensionProvider, providerState.quickInsertProvider);
-  }, [props, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
+    handleProviders(providerFactory.current, getProvidersFromEditorProps({
+      linking: linking,
+      smartLinks: smartLinks,
+      UNSAFE_cards: UNSAFE_cards,
+      autoformattingProvider: autoformattingProvider,
+      media: media,
+      emojiProvider: emojiProvider,
+      mentionProvider: mentionProvider,
+      legacyImageUploadProvider: legacyImageUploadProvider,
+      taskDecisionProvider: taskDecisionProvider,
+      contextIdentifierProvider: contextIdentifierProvider,
+      searchProvider: searchProvider,
+      macroProvider: macroProvider,
+      activityProvider: activityProvider,
+      collabEdit: collabEdit,
+      collabEditProvider: collabEditProvider,
+      presenceProvider: presenceProvider
+    }), providerState.extensionProvider, providerState.quickInsertProvider);
+  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
 
   // componentWillUnmount equivalent
   useEffect(function () {

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