@atlaskit/editor-core 188.13.2 → 188.13.5

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

@@ -42,18 +42,23 @@ const SIDEBAR_LAYOUT_TYPES = [{
   title: toolbarMessages.threeColumnsWithSidebars,
   icon: LayoutThreeWithSidebarsIcon
 }];
-const buildLayoutButton = (intl, item, currentLayout) => ({
+const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI) => ({
   id: item.id,
   type: 'button',
   icon: item.icon,
   testId: item.title.id,
   title: intl.formatMessage(item.title),
-  onClick: setPresetLayout(item.type),
+  onClick: setPresetLayout(editorAnalyticsAPI)(item.type),
   selected: !!currentLayout && currentLayout === item.type,
   tabIndex: null
 });
 export const layoutToolbarTitle = 'Layout floating controls';
-export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) => {
+export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) => {
+  var _api$decorations$acti, _api$decorations, _api$analytics;
+  const {
+    hoverDecoration
+  } = (_api$decorations$acti = api === null || api === void 0 ? void 0 : (_api$decorations = api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {};
+  const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const node = state.doc.nodeAt(pos);
   if (node) {
     const currentLayout = getPresetLayout(node);
@@ -69,7 +74,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       icon: RemoveIcon,
       testId: commonMessages.remove.id,
       title: intl.formatMessage(commonMessages.remove),
-      onClick: deleteActiveLayoutNode,
+      onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
       onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
       onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
@@ -81,7 +86,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       title: layoutToolbarTitle,
       getDomRef: view => findDomRefAtPos(pos, view.domAtPos.bind(view)),
       nodeType,
-      items: [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout)) : []), {
+      items: [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)) : []), {
         type: 'copy-button',
         items: [separator, {
           state,

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

@@ -1,12 +1,12 @@
 import { removeParentNodeOfType, findSelectedNodeOfType, removeSelectedNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { PanelType } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { findPanel } from './utils';
 import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/panel';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { wrapSelectionIn } from '@atlaskit/editor-common/utils';
-export const removePanel = () => (state, dispatch) => {
+export const removePanel = editorAnalyticsAPI => (state, dispatch) => {
   const {
     schema: {
       nodes
@@ -31,11 +31,12 @@ export const removePanel = () => (state, dispatch) => {
     return false;
   }
   if (dispatch) {
-    dispatch(addAnalytics(state, deleteTr, payload));
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(deleteTr);
+    dispatch(deleteTr);
   }
   return true;
 };
-export const changePanelType = (panelType, panelOptions = {}, allowCustomPanel = false) => (state, dispatch) => {
+export const changePanelType = editorAnalyticsAPI => (panelType, panelOptions = {}, allowCustomPanel = false) => (state, dispatch) => {
   const {
     schema: {
       nodes
@@ -85,10 +86,10 @@ export const changePanelType = (panelType, panelOptions = {}, allowCustomPanel =
 
   // Select the panel if it was previously selected
   const newTrWithSelection = state.selection instanceof NodeSelection && state.selection.node.type.name === 'panel' ? newTr.setSelection(new NodeSelection(tr.doc.resolve(panelNode.pos))) : newTr;
-  const changePanelTypeTr = addAnalytics(state, newTrWithSelection, payload);
-  changePanelTypeTr.setMeta('scrollIntoView', false);
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(newTrWithSelection);
+  newTrWithSelection.setMeta('scrollIntoView', false);
   if (dispatch) {
-    dispatch(changePanelTypeTr);
+    dispatch(newTrWithSelection);
   }
   return true;
 };

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

@@ -3,7 +3,7 @@ import { panel, PanelType } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
 import keymap from './pm-plugins/keymaps';
-import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { IconPanel, IconPanelNote, IconPanelSuccess, IconPanelWarning, IconPanelError } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
@@ -56,7 +56,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.INFO
-            }
+            },
+            api
           });
         }
       }, {
@@ -70,7 +71,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.NOTE
-            }
+            },
+            api
           });
         }
       }, {
@@ -85,7 +87,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.SUCCESS
-            }
+            },
+            api
           });
         }
       }, {
@@ -99,7 +102,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.WARNING
-            }
+            },
+            api
           });
         }
       }, {
@@ -113,7 +117,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.ERROR
-            }
+            },
+            api
           });
         }
       }];
@@ -135,7 +140,8 @@ const panelPlugin = ({
                 // TODO: https://product-fabric.atlassian.net/browse/DSP-7268
                 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
                 panelColor: T50
-              }
+              },
+              api
             });
           }
         });
@@ -160,7 +166,8 @@ const panelPlugin = ({
  */
 function createPanelAction({
   state,
-  attributes
+  attributes,
+  api
 }) {
   const tr = createWrapSelectionTransaction({
     state,
@@ -168,7 +175,8 @@ function createPanelAction({
     nodeAttributes: attributes
   });
   if (tr) {
-    addAnalytics(state, tr, {
+    var _api$analytics2;
+    api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
       action: ACTION.INSERTED,
       actionSubject: ACTION_SUBJECT.DOCUMENT,
       actionSubjectId: ACTION_SUBJECT_ID.PANEL,
@@ -177,7 +185,7 @@ function createPanelAction({
         panelType: attributes.panelType
       },
       eventType: EVENT_TYPE.TRACK
-    });
+    })(tr);
   }
   return tr;
 }

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

@@ -48,7 +48,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     id: 'editor.panel.info',
     type: 'button',
     icon: InfoIcon,
-    onClick: changePanelType(PanelType.INFO),
+    onClick: changePanelType(editorAnalyticsAPI)(PanelType.INFO),
     selected: activePanelType === PanelType.INFO,
     title: formatMessage(messages.info),
     tabIndex: null
@@ -56,7 +56,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     id: 'editor.panel.note',
     type: 'button',
     icon: NoteIcon,
-    onClick: changePanelType(PanelType.NOTE),
+    onClick: changePanelType(editorAnalyticsAPI)(PanelType.NOTE),
     selected: activePanelType === PanelType.NOTE,
     title: formatMessage(messages.note),
     tabIndex: null
@@ -64,7 +64,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     id: 'editor.panel.success',
     type: 'button',
     icon: SuccessIcon,
-    onClick: changePanelType(PanelType.SUCCESS),
+    onClick: changePanelType(editorAnalyticsAPI)(PanelType.SUCCESS),
     selected: activePanelType === PanelType.SUCCESS,
     title: formatMessage(messages.success),
     tabIndex: null
@@ -72,7 +72,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     id: 'editor.panel.warning',
     type: 'button',
     icon: WarningIcon,
-    onClick: changePanelType(PanelType.WARNING),
+    onClick: changePanelType(editorAnalyticsAPI)(PanelType.WARNING),
     selected: activePanelType === PanelType.WARNING,
     title: formatMessage(messages.warning),
     tabIndex: null
@@ -80,7 +80,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     id: 'editor.panel.error',
     type: 'button',
     icon: ErrorIcon,
-    onClick: changePanelType(PanelType.ERROR),
+    onClick: changePanelType(editorAnalyticsAPI)(PanelType.ERROR),
     selected: activePanelType === PanelType.ERROR,
     title: formatMessage(messages.error),
     tabIndex: null
@@ -99,7 +99,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         emojiId: panelEmoji.id
       } : {};
       if (previousColor === color) {
-        changePanelType(PanelType.CUSTOM, {
+        changePanelType(editorAnalyticsAPI)(PanelType.CUSTOM, {
           color,
           ...previousEmoji
         }, isCustomPanelEnabled)(state, dispatch);
@@ -115,7 +115,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         },
         eventType: EVENT_TYPE.TRACK
       };
-      withAnalytics(editorAnalyticsAPI, payload)(changePanelType(PanelType.CUSTOM, {
+      withAnalytics(editorAnalyticsAPI, payload)(changePanelType(editorAnalyticsAPI)(PanelType.CUSTOM, {
         color,
         ...previousEmoji
       }, isCustomPanelEnabled))(state, dispatch);
@@ -128,7 +128,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
       }
       let previousIcon = panelNode.node.attrs.panelIcon || '';
       if (previousIcon === emoji.shortName) {
-        changePanelType(PanelType.CUSTOM, {
+        changePanelType(editorAnalyticsAPI)(PanelType.CUSTOM, {
           emoji: emoji.shortName,
           emojiId: emoji.id,
           emojiText: emoji.fallback
@@ -145,7 +145,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         },
         eventType: EVENT_TYPE.TRACK
       };
-      withAnalytics(editorAnalyticsAPI, payload)(changePanelType(PanelType.CUSTOM, {
+      withAnalytics(editorAnalyticsAPI, payload)(changePanelType(editorAnalyticsAPI)(PanelType.CUSTOM, {
         emoji: emoji.shortName,
         emojiId: emoji.id,
         emojiText: emoji.fallback
@@ -169,7 +169,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         },
         eventType: EVENT_TYPE.TRACK
       };
-      withAnalytics(editorAnalyticsAPI, payload)(changePanelType(PanelType.CUSTOM, {
+      withAnalytics(editorAnalyticsAPI, payload)(changePanelType(editorAnalyticsAPI)(PanelType.CUSTOM, {
         emoji: undefined,
         emojiId: undefined,
         emojiText: undefined
@@ -234,7 +234,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onClick: removePanel(),
+    onClick: removePanel(editorAnalyticsAPI),
     onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
     onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
     onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),

package/dist/es2019/version-wrapper.js

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

package/dist/esm/create-editor/feature-flags-from-props.js

@@ -25,7 +25,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 export function createFeatureFlagsFromProps(props) {
-  var _props$allowLayouts, _props$performanceTra, _props$allowExtension, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$featureFlags5, _props$featureFlags6, _props$featureFlags7, _props$featureFlags8, _props$featureFlags9, _props$featureFlags10, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$collabEdit, _props$collabEdit2, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23;
+  var _props$allowLayouts, _props$performanceTra, _props$allowExtension, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$featureFlags5, _props$featureFlags6, _props$featureFlags7, _props$featureFlags8, _props$featureFlags9, _props$featureFlags10, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$collabEdit, _props$collabEdit2, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22;
   var normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
@@ -46,15 +46,14 @@ export function createFeatureFlagsFromProps(props) {
     ufo: Boolean(typeof ((_props$featureFlags11 = props.featureFlags) === null || _props$featureFlags11 === void 0 ? void 0 : _props$featureFlags11.ufo) === 'boolean' ? !!((_props$featureFlags12 = props.featureFlags) !== null && _props$featureFlags12 !== void 0 && _props$featureFlags12.ufo) : false),
     twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags13 = props.featureFlags) === null || _props$featureFlags13 === void 0 ? void 0 : _props$featureFlags13.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags14 = props.featureFlags) !== null && _props$featureFlags14 !== void 0 && _props$featureFlags14.twoLineEditorToolbar) : false),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
-    chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags15 = props.featureFlags) === null || _props$featureFlags15 === void 0 ? void 0 : _props$featureFlags15.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
-    showHoverPreview: Boolean(typeof ((_props$featureFlags16 = props.featureFlags) === null || _props$featureFlags16 === void 0 ? void 0 : _props$featureFlags16.showHoverPreview) === 'boolean' ? !!((_props$featureFlags17 = props.featureFlags) !== null && _props$featureFlags17 !== void 0 && _props$featureFlags17.showHoverPreview) : false),
-    indentationButtonsInTheToolbar: typeof props.showIndentationButtons === 'boolean' ? props.showIndentationButtons : Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags19 = props.featureFlags) !== null && _props$featureFlags19 !== void 0 && _props$featureFlags19.indentationButtonsInTheToolbar) : false)),
-    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
+    showHoverPreview: Boolean(typeof ((_props$featureFlags15 = props.featureFlags) === null || _props$featureFlags15 === void 0 ? void 0 : _props$featureFlags15.showHoverPreview) === 'boolean' ? !!((_props$featureFlags16 = props.featureFlags) !== null && _props$featureFlags16 !== void 0 && _props$featureFlags16.showHoverPreview) : false),
+    indentationButtonsInTheToolbar: typeof props.showIndentationButtons === 'boolean' ? props.showIndentationButtons : Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags17 = props.featureFlags) === null || _props$featureFlags17 === void 0 ? void 0 : _props$featureFlags17.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags18 = props.featureFlags) !== null && _props$featureFlags18 !== void 0 && _props$featureFlags18.indentationButtonsInTheToolbar) : false)),
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags19 = props.featureFlags) === null || _props$featureFlags19 === void 0 ? void 0 : _props$featureFlags19['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags),
     // Including fallback to props.featureFlags so that mobile feature flags
     // are included (they are not kebab cased)
-    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags21 = props.featureFlags) === null || _props$featureFlags21 === void 0 ? void 0 : _props$featureFlags21.restartNumberedLists) === true,
+    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.restartNumberedLists) === true,
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
-    preventPopupOverflow: Boolean(typeof ((_props$featureFlags22 = props.featureFlags) === null || _props$featureFlags22 === void 0 ? void 0 : _props$featureFlags22['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags23 = props.featureFlags) !== null && _props$featureFlags23 !== void 0 && _props$featureFlags23['prevent-popup-overflow']) : false)
+    preventPopupOverflow: Boolean(typeof ((_props$featureFlags21 = props.featureFlags) === null || _props$featureFlags21 === void 0 ? void 0 : _props$featureFlags21['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags22 = props.featureFlags) !== null && _props$featureFlags22 !== void 0 && _props$featureFlags22['prevent-popup-overflow']) : false)
   });
 }

package/dist/esm/plugins/code-block/actions.js

@@ -4,7 +4,6 @@ import { pluginKey } from './plugin-key';
 import { copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
 import { ACTIONS } from './pm-plugins/actions';
 import { copyToClipboard } from '../../utils/clipboard';
-import { addAnalytics } from '../analytics/utils';
 import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { transformToCodeBlockAction } from './transform-to-code-block';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
@@ -23,30 +22,33 @@ export var removeCodeBlock = function removeCodeBlock(state, dispatch) {
   }
   return true;
 };
-export var changeLanguage = function changeLanguage(language) {
-  return function (state, dispatch) {
-    var _pluginKey$getState;
-    var codeBlock = state.schema.nodes.codeBlock;
-    var pos = (_pluginKey$getState = pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.pos;
-    if (typeof pos !== 'number') {
-      return false;
-    }
-    var tr = state.tr.setNodeMarkup(pos, codeBlock, {
-      language: language
-    }).setMeta('scrollIntoView', false);
-    var selection = isNodeSelection(state.selection) ? NodeSelection.create(tr.doc, pos) : tr.selection;
-    var result = tr.setSelection(selection);
-    if (dispatch) {
-      dispatch(addAnalytics(state, result, {
-        action: ACTION.LANGUAGE_SELECTED,
-        actionSubject: ACTION_SUBJECT.CODE_BLOCK,
-        attributes: {
-          language: language
-        },
-        eventType: EVENT_TYPE.TRACK
-      }));
-    }
-    return true;
+export var changeLanguage = function changeLanguage(editorAnalyticsAPI) {
+  return function (language) {
+    return function (state, dispatch) {
+      var _pluginKey$getState;
+      var codeBlock = state.schema.nodes.codeBlock;
+      var pos = (_pluginKey$getState = pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.pos;
+      if (typeof pos !== 'number') {
+        return false;
+      }
+      var tr = state.tr.setNodeMarkup(pos, codeBlock, {
+        language: language
+      }).setMeta('scrollIntoView', false);
+      var selection = isNodeSelection(state.selection) ? NodeSelection.create(tr.doc, pos) : tr.selection;
+      var result = tr.setSelection(selection);
+      if (dispatch) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: ACTION.LANGUAGE_SELECTED,
+          actionSubject: ACTION_SUBJECT.CODE_BLOCK,
+          attributes: {
+            language: language
+          },
+          eventType: EVENT_TYPE.TRACK
+        })(result);
+        dispatch(result);
+      }
+      return true;
+    };
   };
 };
 export var copyContentToClipboard = function copyContentToClipboard(state, dispatch) {

package/dist/esm/plugins/code-block/ide-ux/commands.js

@@ -1,6 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getLinesFromSelection, getLineInfo, forEachLine, getStartOfCurrentLine } from './line-handling';
-import { addAnalytics, ACTION, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INDENT_DIRECTION, INDENT_TYPE, ACTION_SUBJECT } from '../../analytics';
+import { ACTION, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INDENT_DIRECTION, INDENT_TYPE, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 /**
  * Return the current indentation level
  * @param indentText - Text in the code block that represent an indentation
@@ -12,55 +12,21 @@ function getIndentLevel(indentText, indentSize) {
   }
   return indentText.length / indentSize;
 }
-export function indent(state, dispatch) {
-  var _getLinesFromSelectio = getLinesFromSelection(state),
-    text = _getLinesFromSelectio.text,
-    start = _getLinesFromSelectio.start;
-  var tr = state.tr,
-    selection = state.selection;
-  forEachLine(text, function (line, offset) {
-    var _getLineInfo = getLineInfo(line),
-      indentText = _getLineInfo.indentText,
-      indentToken = _getLineInfo.indentToken;
-    var indentLevel = getIndentLevel(indentText, indentToken.size);
-    var indentToAdd = indentToken.token.repeat(indentToken.size - indentText.length % indentToken.size || indentToken.size);
-    tr.insertText(indentToAdd, tr.mapping.map(start + offset, -1));
-    addAnalytics(state, tr, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_INDENT,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: INPUT_METHOD.KEYBOARD,
-        previousIndentationLevel: indentLevel,
-        newIndentLevel: indentLevel + 1,
-        direction: INDENT_DIRECTION.INDENT,
-        indentType: INDENT_TYPE.CODE_BLOCK
-      }
-    });
-    if (!selection.empty) {
-      tr.setSelection(TextSelection.create(tr.doc, tr.mapping.map(selection.from, -1), tr.selection.to));
-    }
-  });
-  if (dispatch) {
-    dispatch(tr);
-  }
-  return true;
-}
-export function outdent(state, dispatch) {
-  var _getLinesFromSelectio2 = getLinesFromSelection(state),
-    text = _getLinesFromSelectio2.text,
-    start = _getLinesFromSelectio2.start;
-  var tr = state.tr;
-  forEachLine(text, function (line, offset) {
-    var _getLineInfo2 = getLineInfo(line),
-      indentText = _getLineInfo2.indentText,
-      indentToken = _getLineInfo2.indentToken;
-    if (indentText) {
+export var indent = function indent(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _getLinesFromSelectio = getLinesFromSelection(state),
+      text = _getLinesFromSelectio.text,
+      start = _getLinesFromSelectio.start;
+    var tr = state.tr,
+      selection = state.selection;
+    forEachLine(text, function (line, offset) {
+      var _getLineInfo = getLineInfo(line),
+        indentText = _getLineInfo.indentText,
+        indentToken = _getLineInfo.indentToken;
       var indentLevel = getIndentLevel(indentText, indentToken.size);
-      var unindentLength = indentText.length % indentToken.size || indentToken.size;
-      tr.delete(tr.mapping.map(start + offset), tr.mapping.map(start + offset + unindentLength));
-      addAnalytics(state, tr, {
+      var indentToAdd = indentToken.token.repeat(indentToken.size - indentText.length % indentToken.size || indentToken.size);
+      tr.insertText(indentToAdd, tr.mapping.map(start + offset, -1));
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
         actionSubjectId: ACTION_SUBJECT_ID.FORMAT_INDENT,
@@ -68,18 +34,56 @@ export function outdent(state, dispatch) {
         attributes: {
           inputMethod: INPUT_METHOD.KEYBOARD,
           previousIndentationLevel: indentLevel,
-          newIndentLevel: indentLevel - 1,
-          direction: INDENT_DIRECTION.OUTDENT,
+          newIndentLevel: indentLevel + 1,
+          direction: INDENT_DIRECTION.INDENT,
           indentType: INDENT_TYPE.CODE_BLOCK
         }
-      });
+      })(tr);
+      if (!selection.empty) {
+        tr.setSelection(TextSelection.create(tr.doc, tr.mapping.map(selection.from, -1), tr.selection.to));
+      }
+    });
+    if (dispatch) {
+      dispatch(tr);
     }
-  });
-  if (dispatch) {
-    dispatch(tr);
-  }
-  return true;
-}
+    return true;
+  };
+};
+export var outdent = function outdent(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _getLinesFromSelectio2 = getLinesFromSelection(state),
+      text = _getLinesFromSelectio2.text,
+      start = _getLinesFromSelectio2.start;
+    var tr = state.tr;
+    forEachLine(text, function (line, offset) {
+      var _getLineInfo2 = getLineInfo(line),
+        indentText = _getLineInfo2.indentText,
+        indentToken = _getLineInfo2.indentToken;
+      if (indentText) {
+        var indentLevel = getIndentLevel(indentText, indentToken.size);
+        var unindentLength = indentText.length % indentToken.size || indentToken.size;
+        tr.delete(tr.mapping.map(start + offset), tr.mapping.map(start + offset + unindentLength));
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: ACTION.FORMATTED,
+          actionSubject: ACTION_SUBJECT.TEXT,
+          actionSubjectId: ACTION_SUBJECT_ID.FORMAT_INDENT,
+          eventType: EVENT_TYPE.TRACK,
+          attributes: {
+            inputMethod: INPUT_METHOD.KEYBOARD,
+            previousIndentationLevel: indentLevel,
+            newIndentLevel: indentLevel - 1,
+            direction: INDENT_DIRECTION.OUTDENT,
+            indentType: INDENT_TYPE.CODE_BLOCK
+          }
+        })(tr);
+      }
+    });
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  };
+};
 export function insertIndent(state, dispatch) {
   var _getStartOfCurrentLin = getStartOfCurrentLine(state),
     textAtStartOfLine = _getStartOfCurrentLin.text;

package/dist/esm/plugins/code-block/index.js

@@ -106,7 +106,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           }
         }];
       },
-      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api === null || api === void 0 ? void 0 : api.decorations.actions.hoverDecoration)
+      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
     }
   };
 };

package/dist/esm/plugins/code-block/pm-plugins/ide-ux.js

@@ -10,6 +10,8 @@ import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-h
 import { getEndOfCurrentLine, getStartOfCurrentLine, isCursorInsideCodeBlock, isSelectionEntirelyInsideCodeBlock, getLineInfo } from '../ide-ux/line-handling';
 import { insertIndent, outdent, indent, insertNewlineWithIndent } from '../ide-ux/commands';
 var ideUX = function ideUX(pluginInjectionApi) {
+  var _pluginInjectionApi$a;
+  var editorAnalyticsAPI = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
   return new SafePlugin({
     props: {
       handleTextInput: function handleTextInput(view, from, to, text) {
@@ -92,8 +94,8 @@ var ideUX = function ideUX(pluginInjectionApi) {
           return false;
         },
         Enter: filter(isSelectionEntirelyInsideCodeBlock, insertNewlineWithIndent),
-        'Mod-]': filter(isSelectionEntirelyInsideCodeBlock, indent),
-        'Mod-[': filter(isSelectionEntirelyInsideCodeBlock, outdent),
+        'Mod-]': filter(isSelectionEntirelyInsideCodeBlock, indent(editorAnalyticsAPI)),
+        'Mod-[': filter(isSelectionEntirelyInsideCodeBlock, outdent(editorAnalyticsAPI)),
         Tab: filter(isSelectionEntirelyInsideCodeBlock, function (state, dispatch) {
           if (!dispatch) {
             return false;
@@ -101,9 +103,9 @@ var ideUX = function ideUX(pluginInjectionApi) {
           if (isCursorInsideCodeBlock(state)) {
             return insertIndent(state, dispatch);
           }
-          return indent(state, dispatch);
+          return indent(editorAnalyticsAPI)(state, dispatch);
         }),
-        'Shift-Tab': filter(isSelectionEntirelyInsideCodeBlock, outdent),
+        'Shift-Tab': filter(isSelectionEntirelyInsideCodeBlock, outdent(editorAnalyticsAPI)),
         'Mod-a': function ModA(state, dispatch) {
           if (isSelectionEntirelyInsideCodeBlock(state)) {
             var _state$selection = state.selection,

package/dist/esm/plugins/code-block/toolbar.js

@@ -18,10 +18,13 @@ export var messages = defineMessages({
 var languageList = createLanguageList(DEFAULT_LANGUAGES);
 export var getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
+  var api = arguments.length > 1 ? arguments[1] : undefined;
   return function (state, _ref) {
-    var _codeBlockState$pos, _node$attrs;
+    var _api$decorations$acti, _api$analytics, _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
+    var _ref2 = (_api$decorations$acti = api === null || api === void 0 ? void 0 : api.decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {},
+      hoverDecoration = _ref2.hoverDecoration;
+    var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
     var codeBlockState = pluginKey.getState(state);
     var pos = (_codeBlockState$pos = codeBlockState === null || codeBlockState === void 0 ? void 0 : codeBlockState.pos) !== null && _codeBlockState$pos !== void 0 ? _codeBlockState$pos : null;
     if (!codeBlockState || pos === null) {
@@ -52,7 +55,7 @@ export var getToolbarConfig = function getToolbarConfig() {
       type: 'select',
       selectType: 'list',
       onChange: function onChange(option) {
-        return changeLanguage(option.value);
+        return changeLanguage(editorAnalyticsAPI)(option.value);
       },
       defaultValue: defaultValue,
       placeholder: formatMessage(messages.selectLanguage),
@@ -110,8 +113,8 @@ export var getToolbarConfig = function getToolbarConfig() {
  * Filters language list based on both name and alias properties.
  */
 export var languageListFilter = function languageListFilter(option, rawInput) {
-  var _ref2 = option,
-    data = _ref2.data;
+  var _ref3 = option,
+    data = _ref3.data;
   var searchString = rawInput.toLowerCase();
   return data.label.toLowerCase().includes(searchString) || data.alias.some(function (alias) {
     return alias.toLowerCase() === searchString;