@atlaskit/editor-plugin-code-block 14.1.0 → 14.1.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-code-block
 
+## 14.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.1.1
+
+### Patch Changes
+
+- [`5bb7d8aa14c4e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5bb7d8aa14c4e) -
+  Fix code block language picker trigger height in legacy toolbar
+- [`49b8e9a322976`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/49b8e9a322976) -
+  Reduce q4 lovability experiment exposure noise in code block setup and bookkeeping paths
+- Updated dependencies
+
 ## 14.1.0
 
 ### Minor Changes

package/dist/cjs/codeBlockPlugin.js

@@ -14,7 +14,6 @@ var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("./editor-commands");
@@ -58,7 +57,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
     nodes: function nodes() {
       return [{
         name: 'codeBlock',
-        node: (0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? _adfSchema.codeBlock : (0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') ? _adfSchema.codeBlockWithLocalId : _adfSchema.codeBlock
+        node: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? _adfSchema.codeBlock : (0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') ? _adfSchema.codeBlockWithLocalId : _adfSchema.codeBlock
       }];
     },
     getSharedState: function getSharedState(state) {
@@ -90,7 +89,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           var schema = _ref3.schema;
           return (0, _inputRule.createCodeBlockInputRule)(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
-      }].concat((0, _toConsumableArray2.default)((0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_code_block_language_detection_flow') ? [{
+      }].concat((0, _toConsumableArray2.default)((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_code_block_q4_lovability', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_code_block_language_detection_flow') ? [{
         name: 'codeBlockAutoDetect',
         plugin: function plugin() {
           return (0, _autoDetect.createAutoDetectPlugin)(api);

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

@@ -15,6 +15,7 @@ var _transforms = require("@atlaskit/editor-common/transforms");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _editorCommands = require("../editor-commands");
 var _codeBlock2 = require("../nodeviews/code-block");
 var _classNames = require("../ui/class-names");
@@ -130,7 +131,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
             isNodeSelected: tr.selection instanceof _state.NodeSelection,
             decorations: updatedDecorationSet
           });
-          if (!(0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+          if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
             return newPluginState;
           }
 
@@ -158,7 +159,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
             shouldIgnoreFollowingMutations: meta.data
           });
         }
-        if ((0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+        if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
           // Failed/unchanged format results and dismissals are meta-only.
           return (0, _formatCodeState.applyFormatCodeMeta)(pluginState, meta);
         }

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

@@ -20,6 +20,7 @@ var _listNumbered = _interopRequireDefault(require("@atlaskit/icon/core/list-num
 var _textWrap = _interopRequireDefault(require("@atlaskit/icon/core/text-wrap"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _editorCommands = require("../editor-commands");
 var _CodeBlockLanguagePicker = require("../ui/CodeBlockLanguagePicker");
 var _WrapIcon = require("../ui/icons/WrapIcon");
@@ -143,6 +144,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
       options: languageSelectOptions,
       filterOption: languageListFilter
     };
+    var areAnyNewToolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     var languagePicker;
     if ((0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_code_block_add_line_number_button')) {
       var autoDetectEntry = typeof localId === 'string' && (0, _platformFeatureFlags.fg)('platform_editor_code_block_language_detection_flow') ? autoDetectState === null || autoDetectState === void 0 ? void 0 : autoDetectState.languageDetectionMap[localId] : undefined;
@@ -165,7 +167,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
             editorView: view,
             filterOption: languageListFilter,
             formatMessage: formatMessage,
-            languagePickerOptions: languagePickerOptions
+            languagePickerOptions: languagePickerOptions,
+            triggerSpacing: !areAnyNewToolbarFlagsEnabled && (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? 'compact' : 'default'
           });
         }
       };
@@ -173,7 +176,6 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
     var separator = {
       type: 'separator'
     };
-    var areAnyNewToolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     var copyToClipboardItems = !allowCopyToClipboard ? [] : [{
       id: 'editor.codeBlock.copy',
       type: 'button',
@@ -246,12 +248,12 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
       };
       copyAndDeleteButtonMenuItems = [separator].concat(copyToClipboardItems, [deleteButton]);
     }
-    var codeBlockWrapButtonTitle = (0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? formatMessage(isWrapped ? _messages.codeBlockButtonMessages.unwrapCodeLabel : _messages.codeBlockButtonMessages.wrapCodeLabel) : formatMessage(_messages.codeBlockButtonMessages.wrapCode);
+    var codeBlockWrapButtonTitle = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? formatMessage(isWrapped ? _messages.codeBlockButtonMessages.unwrapCodeLabel : _messages.codeBlockButtonMessages.wrapCodeLabel) : formatMessage(_messages.codeBlockButtonMessages.wrapCode);
     var codeBlockWrapButton = {
       id: 'editor.codeBlock.wrap',
       type: 'button',
       // Toggling button now writes to ADF, hence it should be available in view mode
-      supportsViewMode: !(0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true),
+      supportsViewMode: !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_code_block_q4_lovability', 'isEnabled', true),
       icon: _textWrap.default,
       iconFallback: _WrapIcon.WrapIcon,
       onClick: (0, _editorCommands.toggleWordWrapStateForCodeBlockNode)(editorAnalyticsAPI),

package/dist/cjs/ui/CodeBlockLanguagePicker.js

@@ -21,7 +21,8 @@ var CodeBlockLanguagePicker = exports.CodeBlockLanguagePicker = function CodeBlo
     editorView = _ref.editorView,
     filterOption = _ref.filterOption,
     formatMessage = _ref.formatMessage,
-    languagePickerOptions = _ref.languagePickerOptions;
+    languagePickerOptions = _ref.languagePickerOptions,
+    triggerSpacing = _ref.triggerSpacing;
   var _useState = (0, _react.useState)(function () {
       return (0, _recentLanguages.getRecentLanguages)();
     }),
@@ -55,6 +56,7 @@ var CodeBlockLanguagePicker = exports.CodeBlockLanguagePicker = function CodeBlo
     languagePickerOptions: languagePickerOptions,
     recentLanguageValues: recentLanguageValues,
     onMenuOpen: refreshRecentLanguages,
-    onSelection: handleSelection
+    onSelection: handleSelection,
+    triggerSpacing: triggerSpacing
   });
 };

package/dist/cjs/ui/LanguagePicker.js

@@ -95,7 +95,9 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     _ref$recentLanguageVa = _ref.recentLanguageValues,
     recentLanguageValues = _ref$recentLanguageVa === void 0 ? [] : _ref$recentLanguageVa,
     onMenuOpen = _ref.onMenuOpen,
-    onSelection = _ref.onSelection;
+    onSelection = _ref.onSelection,
+    _ref$triggerSpacing = _ref.triggerSpacing,
+    triggerSpacing = _ref$triggerSpacing === void 0 ? 'default' : _ref$triggerSpacing;
   var label = (_defaultValue$label = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.label) !== null && _defaultValue$label !== void 0 ? _defaultValue$label : formatMessage(_messages.codeBlockButtonMessages.selectLanguage);
   var selectLanguageLabel = formatMessage(_messages.codeBlockButtonMessages.selectLanguage);
   var _useState = (0, _react.useState)(false),
@@ -198,6 +200,7 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _runtime.ax)([styles.trigger])
     }, /*#__PURE__*/_react.default.createElement(_new.default, {
+      spacing: triggerSpacing,
       shouldFitContainer: true,
       onMouseDown: handleTriggerMouseDown,
       onKeyDown: onKeyDown,
@@ -208,7 +211,7 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
       "aria-controls": ariaControls,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [handleTriggerMouseDown, label]);
+  }, [label, triggerSpacing, handleTriggerMouseDown]);
   return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/es2019/codeBlockPlugin.js

@@ -5,7 +5,6 @@ import { TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_I
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './editor-commands';
@@ -48,7 +47,7 @@ const codeBlockPlugin = ({
     nodes() {
       return [{
         name: 'codeBlock',
-        node: expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? codeBlock : fg('platform_editor_adf_with_localid') ? codeBlockWithLocalId : codeBlock
+        node: expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? codeBlock : fg('platform_editor_adf_with_localid') ? codeBlockWithLocalId : codeBlock
       }];
     },
     getSharedState(state) {
@@ -81,7 +80,7 @@ const codeBlockPlugin = ({
           var _api$analytics;
           return createCodeBlockInputRule(schema, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
-      }, ...(expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) && fg('platform_editor_code_block_language_detection_flow') ? [{
+      }, ...(expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true) && fg('platform_editor_code_block_language_detection_flow') ? [{
         name: 'codeBlockAutoDetect',
         plugin: () => createAutoDetectPlugin(api)
       }] : []), {

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

@@ -7,6 +7,7 @@ import { findCodeBlock } from '@atlaskit/editor-common/transforms';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '../editor-commands';
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { codeBlockClassNames } from '../ui/class-names';
@@ -119,7 +120,7 @@ export const createPlugin = ({
             isNodeSelected: tr.selection instanceof NodeSelection,
             decorations: updatedDecorationSet
           };
-          if (!expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+          if (!expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
             return newPluginState;
           }
 
@@ -151,7 +152,7 @@ export const createPlugin = ({
             shouldIgnoreFollowingMutations: meta.data
           };
         }
-        if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+        if (expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
           // Failed/unchanged format results and dismissals are meta-only.
           return applyFormatCodeMeta(pluginState, meta);
         }

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

@@ -10,6 +10,7 @@ import ListNumberedIcon from '@atlaskit/icon/core/list-numbered';
 import TextWrapIcon from '@atlaskit/icon/core/text-wrap';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { changeLanguage, copyContentToClipboardWithAnalytics, createFormatCodeOnClick, removeCodeBlockWithAnalytics, resetCopiedState, toggleLineNumbersForCodeBlockNode, toggleWordWrapStateForCodeBlockNode } from '../editor-commands';
 import { CodeBlockLanguagePicker } from '../ui/CodeBlockLanguagePicker';
 import { WrapIcon } from '../ui/icons/WrapIcon';
@@ -113,6 +114,7 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLang
       options: languageSelectOptions,
       filterOption: languageListFilter
     };
+    const areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     let languagePicker;
     if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) && fg('platform_editor_code_block_add_line_number_button')) {
       const autoDetectEntry = typeof localId === 'string' && fg('platform_editor_code_block_language_detection_flow') ? autoDetectState === null || autoDetectState === void 0 ? void 0 : autoDetectState.languageDetectionMap[localId] : undefined;
@@ -135,7 +137,8 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLang
             editorView: view,
             filterOption: languageListFilter,
             formatMessage: formatMessage,
-            languagePickerOptions: languagePickerOptions
+            languagePickerOptions: languagePickerOptions,
+            triggerSpacing: !areAnyNewToolbarFlagsEnabled && fg('platform_editor_code_block_dogfooding_patch') ? 'compact' : 'default'
           });
         }
       };
@@ -143,7 +146,6 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLang
     const separator = {
       type: 'separator'
     };
-    const areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     const copyToClipboardItems = !allowCopyToClipboard ? [] : [{
       id: 'editor.codeBlock.copy',
       type: 'button',
@@ -216,12 +218,12 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLang
       };
       copyAndDeleteButtonMenuItems = [separator, ...copyToClipboardItems, deleteButton];
     }
-    const codeBlockWrapButtonTitle = expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? formatMessage(isWrapped ? codeBlockButtonMessages.unwrapCodeLabel : codeBlockButtonMessages.wrapCodeLabel) : formatMessage(codeBlockButtonMessages.wrapCode);
+    const codeBlockWrapButtonTitle = expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? formatMessage(isWrapped ? codeBlockButtonMessages.unwrapCodeLabel : codeBlockButtonMessages.wrapCodeLabel) : formatMessage(codeBlockButtonMessages.wrapCode);
     const codeBlockWrapButton = {
       id: 'editor.codeBlock.wrap',
       type: 'button',
       // Toggling button now writes to ADF, hence it should be available in view mode
-      supportsViewMode: !expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true),
+      supportsViewMode: !expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true),
       icon: TextWrapIcon,
       iconFallback: WrapIcon,
       onClick: toggleWordWrapStateForCodeBlockNode(editorAnalyticsAPI),

package/dist/es2019/ui/CodeBlockLanguagePicker.js

@@ -10,7 +10,8 @@ export const CodeBlockLanguagePicker = ({
   editorView,
   filterOption,
   formatMessage,
-  languagePickerOptions
+  languagePickerOptions,
+  triggerSpacing
 }) => {
   var _api$analytics2;
   const [recentLanguageValues, setRecentLanguageValues] = useState(() => getRecentLanguages());
@@ -41,6 +42,7 @@ export const CodeBlockLanguagePicker = ({
     languagePickerOptions: languagePickerOptions,
     recentLanguageValues: recentLanguageValues,
     onMenuOpen: refreshRecentLanguages,
-    onSelection: handleSelection
+    onSelection: handleSelection,
+    triggerSpacing: triggerSpacing
   });
 };

package/dist/es2019/ui/LanguagePicker.js

@@ -70,7 +70,8 @@ export const LanguagePicker = ({
   languagePickerOptions,
   recentLanguageValues = [],
   onMenuOpen,
-  onSelection
+  onSelection,
+  triggerSpacing = 'default'
 }) => {
   var _defaultValue$label;
   const label = (_defaultValue$label = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.label) !== null && _defaultValue$label !== void 0 ? _defaultValue$label : formatMessage(codeBlockButtonMessages.selectLanguage);
@@ -156,6 +157,7 @@ export const LanguagePicker = ({
   }) => /*#__PURE__*/React.createElement("div", {
     className: ax([styles.trigger])
   }, /*#__PURE__*/React.createElement(Button, {
+    spacing: triggerSpacing,
     shouldFitContainer: true,
     onMouseDown: handleTriggerMouseDown,
     onKeyDown: onKeyDown,
@@ -165,7 +167,7 @@ export const LanguagePicker = ({
     isSelected: isOpen,
     "aria-controls": ariaControls,
     testId: "code-block-language-picker-trigger"
-  }, label)), [handleTriggerMouseDown, label]);
+  }, label)), [label, triggerSpacing, handleTriggerMouseDown]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/esm/codeBlockPlugin.js

@@ -9,7 +9,6 @@ import { TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_I
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './editor-commands';
@@ -51,7 +50,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
     nodes: function nodes() {
       return [{
         name: 'codeBlock',
-        node: expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? codeBlock : fg('platform_editor_adf_with_localid') ? codeBlockWithLocalId : codeBlock
+        node: expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? codeBlock : fg('platform_editor_adf_with_localid') ? codeBlockWithLocalId : codeBlock
       }];
     },
     getSharedState: function getSharedState(state) {
@@ -83,7 +82,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           var schema = _ref3.schema;
           return createCodeBlockInputRule(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
-      }].concat(_toConsumableArray(expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) && fg('platform_editor_code_block_language_detection_flow') ? [{
+      }].concat(_toConsumableArray(expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true) && fg('platform_editor_code_block_language_detection_flow') ? [{
         name: 'codeBlockAutoDetect',
         plugin: function plugin() {
           return createAutoDetectPlugin(api);

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

@@ -10,6 +10,7 @@ import { findCodeBlock } from '@atlaskit/editor-common/transforms';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '../editor-commands';
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { codeBlockClassNames } from '../ui/class-names';
@@ -123,7 +124,7 @@ export var createPlugin = function createPlugin(_ref) {
             isNodeSelected: tr.selection instanceof NodeSelection,
             decorations: updatedDecorationSet
           });
-          if (!expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+          if (!expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
             return newPluginState;
           }
 
@@ -151,7 +152,7 @@ export var createPlugin = function createPlugin(_ref) {
             shouldIgnoreFollowingMutations: meta.data
           });
         }
-        if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+        if (expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
           // Failed/unchanged format results and dismissals are meta-only.
           return applyFormatCodeMeta(pluginState, meta);
         }

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

@@ -14,6 +14,7 @@ import ListNumberedIcon from '@atlaskit/icon/core/list-numbered';
 import TextWrapIcon from '@atlaskit/icon/core/text-wrap';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { changeLanguage, copyContentToClipboardWithAnalytics, createFormatCodeOnClick, removeCodeBlockWithAnalytics, resetCopiedState, toggleLineNumbersForCodeBlockNode, toggleWordWrapStateForCodeBlockNode } from '../editor-commands';
 import { CodeBlockLanguagePicker } from '../ui/CodeBlockLanguagePicker';
 import { WrapIcon } from '../ui/icons/WrapIcon';
@@ -134,6 +135,7 @@ export var getToolbarConfig = function getToolbarConfig() {
       options: languageSelectOptions,
       filterOption: languageListFilter
     };
+    var areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     var languagePicker;
     if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) && fg('platform_editor_code_block_add_line_number_button')) {
       var autoDetectEntry = typeof localId === 'string' && fg('platform_editor_code_block_language_detection_flow') ? autoDetectState === null || autoDetectState === void 0 ? void 0 : autoDetectState.languageDetectionMap[localId] : undefined;
@@ -156,7 +158,8 @@ export var getToolbarConfig = function getToolbarConfig() {
             editorView: view,
             filterOption: languageListFilter,
             formatMessage: formatMessage,
-            languagePickerOptions: languagePickerOptions
+            languagePickerOptions: languagePickerOptions,
+            triggerSpacing: !areAnyNewToolbarFlagsEnabled && fg('platform_editor_code_block_dogfooding_patch') ? 'compact' : 'default'
           });
         }
       };
@@ -164,7 +167,6 @@ export var getToolbarConfig = function getToolbarConfig() {
     var separator = {
       type: 'separator'
     };
-    var areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     var copyToClipboardItems = !allowCopyToClipboard ? [] : [{
       id: 'editor.codeBlock.copy',
       type: 'button',
@@ -237,12 +239,12 @@ export var getToolbarConfig = function getToolbarConfig() {
       };
       copyAndDeleteButtonMenuItems = [separator].concat(copyToClipboardItems, [deleteButton]);
     }
-    var codeBlockWrapButtonTitle = expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? formatMessage(isWrapped ? codeBlockButtonMessages.unwrapCodeLabel : codeBlockButtonMessages.wrapCodeLabel) : formatMessage(codeBlockButtonMessages.wrapCode);
+    var codeBlockWrapButtonTitle = expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true) ? formatMessage(isWrapped ? codeBlockButtonMessages.unwrapCodeLabel : codeBlockButtonMessages.wrapCodeLabel) : formatMessage(codeBlockButtonMessages.wrapCode);
     var codeBlockWrapButton = {
       id: 'editor.codeBlock.wrap',
       type: 'button',
       // Toggling button now writes to ADF, hence it should be available in view mode
-      supportsViewMode: !expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true),
+      supportsViewMode: !expValEqualsNoExposure('platform_editor_code_block_q4_lovability', 'isEnabled', true),
       icon: TextWrapIcon,
       iconFallback: WrapIcon,
       onClick: toggleWordWrapStateForCodeBlockNode(editorAnalyticsAPI),

package/dist/esm/ui/CodeBlockLanguagePicker.js

@@ -12,7 +12,8 @@ export var CodeBlockLanguagePicker = function CodeBlockLanguagePicker(_ref) {
     editorView = _ref.editorView,
     filterOption = _ref.filterOption,
     formatMessage = _ref.formatMessage,
-    languagePickerOptions = _ref.languagePickerOptions;
+    languagePickerOptions = _ref.languagePickerOptions,
+    triggerSpacing = _ref.triggerSpacing;
   var _useState = useState(function () {
       return getRecentLanguages();
     }),
@@ -46,6 +47,7 @@ export var CodeBlockLanguagePicker = function CodeBlockLanguagePicker(_ref) {
     languagePickerOptions: languagePickerOptions,
     recentLanguageValues: recentLanguageValues,
     onMenuOpen: refreshRecentLanguages,
-    onSelection: handleSelection
+    onSelection: handleSelection,
+    triggerSpacing: triggerSpacing
   });
 };

package/dist/esm/ui/LanguagePicker.js

@@ -86,7 +86,9 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     _ref$recentLanguageVa = _ref.recentLanguageValues,
     recentLanguageValues = _ref$recentLanguageVa === void 0 ? [] : _ref$recentLanguageVa,
     onMenuOpen = _ref.onMenuOpen,
-    onSelection = _ref.onSelection;
+    onSelection = _ref.onSelection,
+    _ref$triggerSpacing = _ref.triggerSpacing,
+    triggerSpacing = _ref$triggerSpacing === void 0 ? 'default' : _ref$triggerSpacing;
   var label = (_defaultValue$label = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.label) !== null && _defaultValue$label !== void 0 ? _defaultValue$label : formatMessage(codeBlockButtonMessages.selectLanguage);
   var selectLanguageLabel = formatMessage(codeBlockButtonMessages.selectLanguage);
   var _useState = useState(false),
@@ -189,6 +191,7 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     return /*#__PURE__*/React.createElement("div", {
       className: ax([styles.trigger])
     }, /*#__PURE__*/React.createElement(Button, {
+      spacing: triggerSpacing,
       shouldFitContainer: true,
       onMouseDown: handleTriggerMouseDown,
       onKeyDown: onKeyDown,
@@ -199,7 +202,7 @@ export var LanguagePicker = function LanguagePicker(_ref) {
       "aria-controls": ariaControls,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [handleTriggerMouseDown, label]);
+  }, [label, triggerSpacing, handleTriggerMouseDown]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/types/ui/CodeBlockLanguagePicker.d.ts

@@ -7,5 +7,5 @@ type CodeBlockLanguagePickerProps = Omit<LanguagePickerProps, 'recentLanguageVal
     api: ExtractInjectionAPI<CodeBlockPlugin> | undefined;
     editorView: EditorView;
 };
-export declare const CodeBlockLanguagePicker: ({ api, defaultValue, editorView, filterOption, formatMessage, languagePickerOptions, }: CodeBlockLanguagePickerProps) => React.JSX.Element;
+export declare const CodeBlockLanguagePicker: ({ api, defaultValue, editorView, filterOption, formatMessage, languagePickerOptions, triggerSpacing, }: CodeBlockLanguagePickerProps) => React.JSX.Element;
 export {};

package/dist/types/ui/LanguagePicker.d.ts

@@ -14,5 +14,6 @@ export type LanguagePickerProps = {
     onMenuOpen?: () => void;
     onSelection: (option: LanguagePickerOption, selectionSource: LanguagePickerSelectionSource) => void;
     recentLanguageValues?: string[];
+    triggerSpacing?: 'default' | 'compact';
 };
-export declare const LanguagePicker: ({ defaultValue, filterOption, formatMessage, languagePickerOptions, recentLanguageValues, onMenuOpen, onSelection, }: LanguagePickerProps) => React.JSX.Element;
+export declare const LanguagePicker: ({ defaultValue, filterOption, formatMessage, languagePickerOptions, recentLanguageValues, onMenuOpen, onSelection, triggerSpacing, }: LanguagePickerProps) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "14.1.0",
+	"version": "14.1.2",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,13 +42,13 @@
 		"@atlaskit/primitives": "^20.0.0",
 		"@atlaskit/prosemirror-input-rules": "^4.0.0",
 		"@atlaskit/select": "^22.1.0",
-		"@atlaskit/tmp-editor-statsig": "^110.0.0",
+		"@atlaskit/tmp-editor-statsig": "^112.0.0",
 		"@atlaskit/tokens": "^15.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.11.0",
+		"@atlaskit/editor-common": "^116.12.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},