@atlaskit/editor-plugin-code-block 4.3.0 → 4.4.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-code-block
 
+## 4.4.1
+
+### Patch Changes
+
+- [#149482](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149482)
+  [`1f1f73876c3c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f1f73876c3c8) -
+  ED-27860 Add analytics for copy and delete button in floating toolbars
+- Updated dependencies
+
+## 4.4.0
+
+### Minor Changes
+
+- [#141575](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141575)
+  [`4639ea2b9bab0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4639ea2b9bab0) -
+  Adds support for overriding language names in the code block language list.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.3.0
 
 ### Minor Changes

package/dist/cjs/codeBlockPlugin.js

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

package/dist/cjs/editor-commands/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.copyContentToClipboard = exports.changeLanguage = void 0;
+exports.copyContentToClipboardWithAnalytics = exports.copyContentToClipboard = exports.changeLanguage = void 0;
 exports.createInsertCodeBlockTransaction = createInsertCodeBlockTransaction;
 exports.ignoreFollowingMutations = void 0;
 exports.insertCodeBlockWithAnalytics = insertCodeBlockWithAnalytics;
-exports.toggleWordWrapStateForCodeBlockNode = exports.resetShouldIgnoreFollowingMutations = exports.resetCopiedState = exports.removeCodeBlock = void 0;
+exports.toggleWordWrapStateForCodeBlockNode = exports.resetShouldIgnoreFollowingMutations = exports.resetCopiedState = exports.removeCodeBlockWithAnalytics = exports.removeCodeBlock = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _clipboard = require("@atlaskit/editor-common/clipboard");
 var _codeBlock = require("@atlaskit/editor-common/code-block");
@@ -20,6 +20,16 @@ var _actions = require("../pm-plugins/actions");
 var _codeBlockCopySelectionPlugin = require("../pm-plugins/codeBlockCopySelectionPlugin");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _transformToCodeBlock = require("../pm-plugins/transform-to-code-block");
+var removeCodeBlockWithAnalytics = exports.removeCodeBlockWithAnalytics = function removeCodeBlockWithAnalytics(editorAnalyticsAPI) {
+  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+    action: _analytics.ACTION.DELETED,
+    actionSubject: _analytics.ACTION_SUBJECT.CODE_BLOCK,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+    },
+    eventType: _analytics.EVENT_TYPE.TRACK
+  })(removeCodeBlock);
+};
 var removeCodeBlock = exports.removeCodeBlock = function removeCodeBlock(state, dispatch) {
   var nodes = state.schema.nodes,
     tr = state.tr;
@@ -63,6 +73,35 @@ var changeLanguage = exports.changeLanguage = function changeLanguage(editorAnal
     };
   };
 };
+var copyContentToClipboardWithAnalytics = exports.copyContentToClipboardWithAnalytics = function copyContentToClipboardWithAnalytics(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var nodes = state.schema.nodes,
+      tr = state.tr;
+    var codeBlock = (0, _utils.findParentNodeOfType)(nodes.codeBlock)(tr.selection);
+    var textContent = codeBlock && codeBlock.node.textContent;
+    if (textContent) {
+      (0, _clipboard.copyToClipboard)(textContent);
+      var copyToClipboardTr = tr;
+      copyToClipboardTr.setMeta(_pluginKey.pluginKey, {
+        type: _actions.ACTIONS.SET_COPIED_TO_CLIPBOARD,
+        data: true
+      });
+      copyToClipboardTr.setMeta(_codeBlockCopySelectionPlugin.copySelectionPluginKey, 'remove-selection');
+      if (editorAnalyticsAPI) {
+        var analyticsPayload = (0, _clipboard.getAnalyticsPayload)(state, _analytics.ACTION.COPIED);
+        if (analyticsPayload) {
+          analyticsPayload.attributes.inputMethod = _analytics.INPUT_METHOD.FLOATING_TB;
+          analyticsPayload.attributes.nodeType = codeBlock === null || codeBlock === void 0 ? void 0 : codeBlock.node.type.name;
+          editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(copyToClipboardTr);
+        }
+      }
+      if (dispatch) {
+        dispatch(copyToClipboardTr);
+      }
+    }
+    return true;
+  };
+};
 var copyContentToClipboard = exports.copyContentToClipboard = function copyContentToClipboard(state, dispatch) {
   var nodes = state.schema.nodes,
     tr = state.tr;

package/dist/cjs/pm-plugins/toolbar.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.languageListFilter = exports.getToolbarConfig = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
@@ -21,10 +22,12 @@ var _languageList = require("./language-list");
 var _pluginKey = require("./plugin-key");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var languageList = (0, _languageList.createLanguageList)(_languageList.DEFAULT_LANGUAGES);
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var api = arguments.length > 1 ? arguments[1] : undefined;
+  var overrideLanguageName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
   return function (state, _ref) {
     var _api$decorations$acti, _api$decorations, _api$analytics, _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
@@ -43,6 +46,11 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
     }
     var isWrapped = (0, _codeBlock.isCodeBlockWordWrapEnabled)(node);
     var language = node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.language;
+    var languageList = (0, _languageList.createLanguageList)(overrideLanguageName ? _languageList.DEFAULT_LANGUAGES.map(function (language) {
+      return _objectSpread(_objectSpread({}, language), {}, {
+        name: overrideLanguageName(language.name)
+      });
+    }) : _languageList.DEFAULT_LANGUAGES);
     var options = languageList.map(function (lang) {
       return {
         label: lang.name,
@@ -80,7 +88,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
       icon: _copy.default,
       // note: copyContentToClipboard contains logic that also removes the
       // visual feedback for the copy button
-      onClick: _editorCommands.copyContentToClipboard,
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? (0, _editorCommands.copyContentToClipboardWithAnalytics)(editorAnalyticsAPI) : _editorCommands.copyContentToClipboard,
       title: formatMessage(codeBlockState.contentCopied ? _messages.codeBlockButtonMessages.copiedCodeToClipboard : _messages.codeBlockButtonMessages.copyCodeToClipboard),
       onMouseEnter: _codeBlockCopySelectionPlugin.provideVisualFeedbackForCopyButton,
       // note: resetCopiedState contains logic that also removes the
@@ -102,7 +110,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
       onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
-      onClick: _editorCommands.removeCodeBlock,
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? (0, _editorCommands.removeCodeBlockWithAnalytics)(editorAnalyticsAPI) : _editorCommands.removeCodeBlock,
       title: formatMessage(_messages.default.remove),
       tabIndex: null
     };

package/dist/es2019/codeBlockPlugin.js

@@ -108,7 +108,7 @@ const codeBlockPlugin = ({
           return tr;
         }
       }],
-      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
+      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api, options === null || options === void 0 ? void 0 : options.overrideLanguageName)
     }
   };
 };

package/dist/es2019/editor-commands/index.js

@@ -1,5 +1,5 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, MODE, PLATFORMS } from '@atlaskit/editor-common/analytics';
-import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, MODE, PLATFORMS, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { copyToClipboard, getAnalyticsPayload } from '@atlaskit/editor-common/clipboard';
 import { codeBlockWrappedStates, isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { contentAllowedInCodeBlock, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
@@ -10,6 +10,16 @@ import { ACTIONS } from '../pm-plugins/actions';
 import { copySelectionPluginKey } from '../pm-plugins/codeBlockCopySelectionPlugin';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { transformToCodeBlockAction } from '../pm-plugins/transform-to-code-block';
+export const removeCodeBlockWithAnalytics = editorAnalyticsAPI => {
+  return withAnalytics(editorAnalyticsAPI, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.CODE_BLOCK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(removeCodeBlock);
+};
 export const removeCodeBlock = (state, dispatch) => {
   const {
     schema: {
@@ -55,6 +65,37 @@ export const changeLanguage = editorAnalyticsAPI => language => (state, dispatch
   }
   return true;
 };
+export const copyContentToClipboardWithAnalytics = editorAnalyticsAPI => (state, dispatch) => {
+  const {
+    schema: {
+      nodes
+    },
+    tr
+  } = state;
+  const codeBlock = findParentNodeOfType(nodes.codeBlock)(tr.selection);
+  const textContent = codeBlock && codeBlock.node.textContent;
+  if (textContent) {
+    copyToClipboard(textContent);
+    const copyToClipboardTr = tr;
+    copyToClipboardTr.setMeta(pluginKey, {
+      type: ACTIONS.SET_COPIED_TO_CLIPBOARD,
+      data: true
+    });
+    copyToClipboardTr.setMeta(copySelectionPluginKey, 'remove-selection');
+    if (editorAnalyticsAPI) {
+      const analyticsPayload = getAnalyticsPayload(state, ACTION.COPIED);
+      if (analyticsPayload) {
+        analyticsPayload.attributes.inputMethod = INPUT_METHOD.FLOATING_TB;
+        analyticsPayload.attributes.nodeType = codeBlock === null || codeBlock === void 0 ? void 0 : codeBlock.node.type.name;
+        editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(copyToClipboardTr);
+      }
+    }
+    if (dispatch) {
+      dispatch(copyToClipboardTr);
+    }
+  }
+  return true;
+};
 export const copyContentToClipboard = (state, dispatch) => {
   const {
     schema: {

package/dist/es2019/pm-plugins/toolbar.js

@@ -6,13 +6,12 @@ import CopyIcon from '@atlaskit/icon/core/migration/copy';
 import RemoveIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
 import TextWrapIcon from '@atlaskit/icon/core/text-wrap';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { changeLanguage, copyContentToClipboard, removeCodeBlock, resetCopiedState, toggleWordWrapStateForCodeBlockNode } from '../editor-commands';
+import { changeLanguage, copyContentToClipboard, copyContentToClipboardWithAnalytics, removeCodeBlock, removeCodeBlockWithAnalytics, resetCopiedState, toggleWordWrapStateForCodeBlockNode } from '../editor-commands';
 import { WrapIcon } from '../ui/icons/WrapIcon';
 import { provideVisualFeedbackForCopyButton, removeVisualFeedbackForCopyButton } from './codeBlockCopySelectionPlugin';
 import { createLanguageList, DEFAULT_LANGUAGES, getLanguageIdentifier } from './language-list';
 import { pluginKey } from './plugin-key';
-const languageList = createLanguageList(DEFAULT_LANGUAGES);
-export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
+export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLanguageName = undefined) => (state, {
   formatMessage
 }) => {
   var _api$decorations$acti, _api$decorations, _api$analytics, _codeBlockState$pos, _node$attrs;
@@ -32,6 +31,10 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
   }
   const isWrapped = isCodeBlockWordWrapEnabled(node);
   const language = node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.language;
+  const languageList = createLanguageList(overrideLanguageName ? DEFAULT_LANGUAGES.map(language => ({
+    ...language,
+    name: overrideLanguageName(language.name)
+  })) : DEFAULT_LANGUAGES);
   const options = languageList.map(lang => ({
     label: lang.name,
     value: getLanguageIdentifier(lang),
@@ -61,7 +64,7 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
     icon: CopyIcon,
     // note: copyContentToClipboard contains logic that also removes the
     // visual feedback for the copy button
-    onClick: copyContentToClipboard,
+    onClick: fg('platform_editor_controls_patch_analytics_2') ? copyContentToClipboardWithAnalytics(editorAnalyticsAPI) : copyContentToClipboard,
     title: formatMessage(codeBlockState.contentCopied ? codeBlockButtonMessages.copiedCodeToClipboard : codeBlockButtonMessages.copyCodeToClipboard),
     onMouseEnter: provideVisualFeedbackForCopyButton,
     // note: resetCopiedState contains logic that also removes the
@@ -83,7 +86,7 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
     onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
     onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
     onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
-    onClick: removeCodeBlock,
+    onClick: fg('platform_editor_controls_patch_analytics_2') ? removeCodeBlockWithAnalytics(editorAnalyticsAPI) : removeCodeBlock,
     title: formatMessage(commonMessages.remove),
     tabIndex: null
   };

package/dist/esm/codeBlockPlugin.js

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

package/dist/esm/editor-commands/index.js

@@ -1,5 +1,5 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, MODE, PLATFORMS } from '@atlaskit/editor-common/analytics';
-import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, MODE, PLATFORMS, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { copyToClipboard, getAnalyticsPayload } from '@atlaskit/editor-common/clipboard';
 import { codeBlockWrappedStates, isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { contentAllowedInCodeBlock, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
@@ -10,6 +10,16 @@ import { ACTIONS } from '../pm-plugins/actions';
 import { copySelectionPluginKey } from '../pm-plugins/codeBlockCopySelectionPlugin';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { transformToCodeBlockAction } from '../pm-plugins/transform-to-code-block';
+export var removeCodeBlockWithAnalytics = function removeCodeBlockWithAnalytics(editorAnalyticsAPI) {
+  return withAnalytics(editorAnalyticsAPI, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.CODE_BLOCK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(removeCodeBlock);
+};
 export var removeCodeBlock = function removeCodeBlock(state, dispatch) {
   var nodes = state.schema.nodes,
     tr = state.tr;
@@ -53,6 +63,35 @@ export var changeLanguage = function changeLanguage(editorAnalyticsAPI) {
     };
   };
 };
+export var copyContentToClipboardWithAnalytics = function copyContentToClipboardWithAnalytics(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var nodes = state.schema.nodes,
+      tr = state.tr;
+    var codeBlock = findParentNodeOfType(nodes.codeBlock)(tr.selection);
+    var textContent = codeBlock && codeBlock.node.textContent;
+    if (textContent) {
+      copyToClipboard(textContent);
+      var copyToClipboardTr = tr;
+      copyToClipboardTr.setMeta(pluginKey, {
+        type: ACTIONS.SET_COPIED_TO_CLIPBOARD,
+        data: true
+      });
+      copyToClipboardTr.setMeta(copySelectionPluginKey, 'remove-selection');
+      if (editorAnalyticsAPI) {
+        var analyticsPayload = getAnalyticsPayload(state, ACTION.COPIED);
+        if (analyticsPayload) {
+          analyticsPayload.attributes.inputMethod = INPUT_METHOD.FLOATING_TB;
+          analyticsPayload.attributes.nodeType = codeBlock === null || codeBlock === void 0 ? void 0 : codeBlock.node.type.name;
+          editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(copyToClipboardTr);
+        }
+      }
+      if (dispatch) {
+        dispatch(copyToClipboardTr);
+      }
+    }
+    return true;
+  };
+};
 export var copyContentToClipboard = function copyContentToClipboard(state, dispatch) {
   var nodes = state.schema.nodes,
     tr = state.tr;

package/dist/esm/pm-plugins/toolbar.js

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import commonMessages, { codeBlockButtonMessages } from '@atlaskit/editor-common/messages';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
@@ -6,15 +9,15 @@ import CopyIcon from '@atlaskit/icon/core/migration/copy';
 import RemoveIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
 import TextWrapIcon from '@atlaskit/icon/core/text-wrap';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { changeLanguage, copyContentToClipboard, removeCodeBlock, resetCopiedState, toggleWordWrapStateForCodeBlockNode } from '../editor-commands';
+import { changeLanguage, copyContentToClipboard, copyContentToClipboardWithAnalytics, removeCodeBlock, removeCodeBlockWithAnalytics, resetCopiedState, toggleWordWrapStateForCodeBlockNode } from '../editor-commands';
 import { WrapIcon } from '../ui/icons/WrapIcon';
 import { provideVisualFeedbackForCopyButton, removeVisualFeedbackForCopyButton } from './codeBlockCopySelectionPlugin';
 import { createLanguageList, DEFAULT_LANGUAGES, getLanguageIdentifier } from './language-list';
 import { pluginKey } from './plugin-key';
-var languageList = createLanguageList(DEFAULT_LANGUAGES);
 export var getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var api = arguments.length > 1 ? arguments[1] : undefined;
+  var overrideLanguageName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
   return function (state, _ref) {
     var _api$decorations$acti, _api$decorations, _api$analytics, _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
@@ -33,6 +36,11 @@ export var getToolbarConfig = function getToolbarConfig() {
     }
     var isWrapped = isCodeBlockWordWrapEnabled(node);
     var language = node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.language;
+    var languageList = createLanguageList(overrideLanguageName ? DEFAULT_LANGUAGES.map(function (language) {
+      return _objectSpread(_objectSpread({}, language), {}, {
+        name: overrideLanguageName(language.name)
+      });
+    }) : DEFAULT_LANGUAGES);
     var options = languageList.map(function (lang) {
       return {
         label: lang.name,
@@ -70,7 +78,7 @@ export var getToolbarConfig = function getToolbarConfig() {
       icon: CopyIcon,
       // note: copyContentToClipboard contains logic that also removes the
       // visual feedback for the copy button
-      onClick: copyContentToClipboard,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? copyContentToClipboardWithAnalytics(editorAnalyticsAPI) : copyContentToClipboard,
       title: formatMessage(codeBlockState.contentCopied ? codeBlockButtonMessages.copiedCodeToClipboard : codeBlockButtonMessages.copyCodeToClipboard),
       onMouseEnter: provideVisualFeedbackForCopyButton,
       // note: resetCopiedState contains logic that also removes the
@@ -92,7 +100,7 @@ export var getToolbarConfig = function getToolbarConfig() {
       onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
-      onClick: removeCodeBlock,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeCodeBlockWithAnalytics(editorAnalyticsAPI) : removeCodeBlock,
       title: formatMessage(commonMessages.remove),
       tabIndex: null
     };

package/dist/types/editor-commands/index.d.ts

@@ -1,8 +1,11 @@
-import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const removeCodeBlockWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const removeCodeBlock: Command;
 export declare const changeLanguage: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (language: string) => Command;
+export declare const copyContentToClipboardWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const copyContentToClipboard: Command;
 export declare const resetCopiedState: Command;
 export declare const ignoreFollowingMutations: Command;

package/dist/types/pm-plugins/toolbar.d.ts

@@ -1,6 +1,7 @@
 import type { ExtractInjectionAPI, FloatingToolbarHandler, SelectOption } from '@atlaskit/editor-common/types';
 import type { CodeBlockPlugin } from '../index';
-export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined) => FloatingToolbarHandler;
+import { Language } from './language-list';
+export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined, overrideLanguageName?: ((name: Language['name']) => string) | undefined) => FloatingToolbarHandler;
 /**
  * Filters language list based on both name and alias properties.
  */

package/dist/types/types/index.d.ts

@@ -2,6 +2,7 @@ import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/ty
 export interface CodeBlockPluginOptions extends LongPressSelectionPluginOptions {
     allowCopyToClipboard?: boolean;
     allowCompositionInputOverride?: boolean;
+    overrideLanguageName?: (name: string) => string;
 }
 /**
  * @private

package/dist/types-ts4.5/editor-commands/index.d.ts

@@ -1,8 +1,11 @@
-import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const removeCodeBlockWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const removeCodeBlock: Command;
 export declare const changeLanguage: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (language: string) => Command;
+export declare const copyContentToClipboardWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const copyContentToClipboard: Command;
 export declare const resetCopiedState: Command;
 export declare const ignoreFollowingMutations: Command;

package/dist/types-ts4.5/pm-plugins/toolbar.d.ts

@@ -1,6 +1,7 @@
 import type { ExtractInjectionAPI, FloatingToolbarHandler, SelectOption } from '@atlaskit/editor-common/types';
 import type { CodeBlockPlugin } from '../index';
-export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined) => FloatingToolbarHandler;
+import { Language } from './language-list';
+export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined, overrideLanguageName?: ((name: Language['name']) => string) | undefined) => FloatingToolbarHandler;
 /**
  * Filters language list based on both name and alias properties.
  */

package/dist/types-ts4.5/types/index.d.ts

@@ -2,6 +2,7 @@ import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/ty
 export interface CodeBlockPluginOptions extends LongPressSelectionPluginOptions {
     allowCopyToClipboard?: boolean;
     allowCompositionInputOverride?: boolean;
+    overrideLanguageName?: (name: string) => string;
 }
 /**
  * @private

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "4.3.0",
+	"version": "4.4.1",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,17 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/code": "^17.0.0",
-		"@atlaskit/editor-common": "^103.4.0",
+		"@atlaskit/code": "^17.1.0",
+		"@atlaskit/editor-common": "^104.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-composition": "^1.3.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^25.5.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.16.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -100,6 +100,9 @@
 		"editor_code_wrapping_perf_improvement_ed-25141": {
 			"type": "boolean"
 		},
+		"platform_editor_controls_patch_analytics_2": {
+			"type": "boolean"
+		},
 		"editor_a11y_remove_unwrap_button": {
 			"type": "boolean"
 		}