@atlaskit/editor-plugin-code-block 19.0.7 → 19.0.10

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-code-block
 
+## 19.0.10
+
+### Patch Changes
+
+- [`b615f1183f88d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b615f1183f88d) -
+  Clean up feature gate `platform_editor_code_block_ga_patch_1`
+- Updated dependencies
+
+## 19.0.9
+
+### Patch Changes
+
+- Updated dependencies
+
+## 19.0.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 19.0.7
 
 ### Patch Changes

package/dist/cjs/ui/CodeBlockLanguagePicker.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.CodeBlockLanguagePicker = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorCommands = require("../editor-commands");
 var _languagePickerOptions = require("./language-picker-options");
 var _LanguagePicker = require("./LanguagePicker");
@@ -35,27 +34,18 @@ var CodeBlockLanguagePicker = exports.CodeBlockLanguagePicker = function CodeBlo
   var handleSelection = (0, _react.useCallback)(function (option, selectionSource, interactionMethod) {
     var _api$analytics;
     var isDetectLanguageSelected = option.value === _languagePickerOptions.DETECT_LANGUAGE_VALUE;
-    var command = isDetectLanguageSelected && ((0, _fg.fg)('platform_editor_code_block_ga_patch_1') || (0, _fg.fg)('platform_editor_code_block_language_detection_flow')) ? (0, _editorCommands.detectLanguage)() : (0, _editorCommands.changeLanguage)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
+    var command = isDetectLanguageSelected ? (0, _editorCommands.detectLanguage)() : (0, _editorCommands.changeLanguage)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
     var commandSucceeded = command(editorView.state, editorView.dispatch);
-    if ((0, _fg.fg)('platform_editor_code_block_ga_patch_1')) {
-      if (interactionMethod === 'mouse') {
-        requestAnimationFrame(function () {
-          // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
-          // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
-          api === null || api === void 0 || api.core.actions.focus({
-            scrollIntoView: false
-          });
-        });
-      }
-    } else {
+    if (interactionMethod === 'mouse') {
       requestAnimationFrame(function () {
-        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+        // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
+        // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
         api === null || api === void 0 || api.core.actions.focus({
           scrollIntoView: false
         });
       });
     }
-    if (commandSucceeded && (option.value !== _languagePickerOptions.DETECT_LANGUAGE_VALUE || (0, _fg.fg)('platform_editor_code_block_ga_patch_1'))) {
+    if (commandSucceeded) {
       (0, _recentLanguages.saveRecentLanguage)(option.value);
       setRecentLanguageValues((0, _recentLanguages.getRecentLanguages)());
     }

package/dist/cjs/ui/LanguagePicker.compiled.css

@@ -1,11 +1,7 @@
 ._h7alglyw{border-inline:none}._179rglyw{border-block-end:none}
 ._mqm2ia51{border-block-start:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
-._18m915vq{overflow-y:hidden}
 ._1bsb1osq{width:100%}
-._1bto1l2s{text-overflow:ellipsis}
-._1reo15vq{overflow-x:hidden}
 ._1xw9glyw button:after{content:none}
 ._ficf1e5h button{text-align:left}
-._o5721q9c{white-space:nowrap}
 ._p12fuuw1{max-width:200px}
 ._vwz478tn{line-height:1.714}

package/dist/cjs/ui/LanguagePicker.js

@@ -16,7 +16,6 @@ var _button = _interopRequireDefault(require("@atlaskit/button/default/button"))
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _popupSelect = require("@atlaskit/select/popup-select");
 var _components = require("@atlaskit/react-select/components");
@@ -28,8 +27,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 var pickerOptionStyles = null;
 var styles = {
   divider: "_h7alglyw _179rglyw _mqm2ia51 _1bsb1osq",
-  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw",
-  legacyTriggerTextOverflow: "_1reo15vq _18m915vq _1bto1l2s _o5721q9c"
+  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw"
 };
 var CustomGroup = function CustomGroup(props) {
   var allGroups = props.selectProps.options;
@@ -154,11 +152,7 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     }
     var isSearchSelection = inputValueRef.current.trim().length > 0;
     var selectionSource = isSearchSelection ? 'search' : (_option$selectionSour = option.selectionSource) !== null && _option$selectionSour !== void 0 ? _option$selectionSour : 'all';
-    if ((0, _fg.fg)('platform_editor_code_block_ga_patch_1')) {
-      onSelection(option, selectionSource, interactionMethodRef.current);
-    } else {
-      onSelection(option, selectionSource);
-    }
+    onSelection(option, selectionSource, interactionMethodRef.current);
   }, [onSelection]);
   var handleInputChange = (0, _react.useCallback)(function (newInputValue, actionMeta) {
     // React-select clears the input as part of selecting a value before onChange fires.
@@ -177,22 +171,12 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     setLockedPopperPlacement(undefined);
     onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
   }, [onMenuOpen]);
-  var handleTriggerMouseDown = (0, _react.useCallback)(function (event) {
-    // PopupSelect's FocusLock returns focus to the element that was focused before the
-    // picker opened. If that is the editor/code block, closing the picker can scroll the
-    // whole code block into view. Focus the trigger first without scrolling so FocusLock
-    // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
-    // editor focus.
-    focusWithoutScrolling(event.currentTarget);
-  }, []);
   var handleTriggerMouseUp = (0, _react.useCallback)(function (event) {
-    if ((0, _fg.fg)('platform_editor_code_block_ga_patch_1')) {
-      interactionMethodRef.current = 'mouse';
-      // Focus the trigger before PopupSelect opens so FocusLock restores focus to the
-      // trigger after a mouse selection. Relying on the button's default mouse focus is too
-      // late here; FocusLock can still remember the code block as the previous focus target.
-      focusWithoutScrolling(event.currentTarget);
-    }
+    interactionMethodRef.current = 'mouse';
+    // Focus the trigger before PopupSelect opens so FocusLock restores focus to the
+    // trigger after a mouse selection. Relying on the button's default mouse focus is too
+    // late here; FocusLock can still remember the code block as the previous focus target.
+    focusWithoutScrolling(event.currentTarget);
   }, []);
   var handleTriggerKeyDownCapture = (0, _react.useCallback)(function () {
     interactionMethodRef.current = 'keyboard';
@@ -205,24 +189,23 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
       ariaExpanded = _ref3['aria-expanded'],
       ariaHasPopup = _ref3['aria-haspopup'];
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _runtime.ax)([styles.trigger, !(0, _fg.fg)('platform_editor_code_block_ga_patch_1') && styles.legacyTriggerTextOverflow])
+      className: (0, _runtime.ax)([styles.trigger])
     }, /*#__PURE__*/_react.default.createElement(_button.default, {
       spacing: triggerSpacing,
       shouldFitContainer: true,
-      onMouseDown: (0, _fg.fg)('platform_editor_code_block_ga_patch_1') ? undefined : handleTriggerMouseDown,
-      onMouseUp: (0, _fg.fg)('platform_editor_code_block_ga_patch_1') ? handleTriggerMouseUp : undefined,
-      onKeyDownCapture: (0, _fg.fg)('platform_editor_code_block_ga_patch_1') ? handleTriggerKeyDownCapture : undefined,
+      onMouseUp: handleTriggerMouseUp,
+      onKeyDownCapture: handleTriggerKeyDownCapture,
       onKeyDown: onKeyDown,
       ref: ref,
       iconAfter: _chevronDown.default,
       appearance: "subtle",
       isSelected: isOpen,
       "aria-controls": ariaControls,
-      "aria-expanded": (0, _fg.fg)('platform_editor_code_block_ga_patch_1') ? ariaExpanded : undefined,
-      "aria-haspopup": (0, _fg.fg)('platform_editor_code_block_ga_patch_1') ? ariaHasPopup : undefined,
+      "aria-expanded": ariaExpanded,
+      "aria-haspopup": ariaHasPopup,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [label, triggerSpacing, handleTriggerMouseDown, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
+  }, [label, triggerSpacing, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
   return /*#__PURE__*/_react.default.createElement(_popupSelect.PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/es2019/ui/CodeBlockLanguagePicker.js

@@ -1,5 +1,4 @@
 import React, { useCallback, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { changeLanguage, detectLanguage } from '../editor-commands';
 import { DETECT_LANGUAGE_VALUE } from './language-picker-options';
 import { LanguagePicker } from './LanguagePicker';
@@ -21,27 +20,18 @@ export const CodeBlockLanguagePicker = ({
   const handleSelection = useCallback((option, selectionSource, interactionMethod) => {
     var _api$analytics;
     const isDetectLanguageSelected = option.value === DETECT_LANGUAGE_VALUE;
-    const command = isDetectLanguageSelected && (fg('platform_editor_code_block_ga_patch_1') || fg('platform_editor_code_block_language_detection_flow')) ? detectLanguage() : changeLanguage(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
+    const command = isDetectLanguageSelected ? detectLanguage() : changeLanguage(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
     const commandSucceeded = command(editorView.state, editorView.dispatch);
-    if (fg('platform_editor_code_block_ga_patch_1')) {
-      if (interactionMethod === 'mouse') {
-        requestAnimationFrame(() => {
-          // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
-          // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
-          api === null || api === void 0 ? void 0 : api.core.actions.focus({
-            scrollIntoView: false
-          });
-        });
-      }
-    } else {
+    if (interactionMethod === 'mouse') {
       requestAnimationFrame(() => {
-        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+        // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
+        // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
         api === null || api === void 0 ? void 0 : api.core.actions.focus({
           scrollIntoView: false
         });
       });
     }
-    if (commandSucceeded && (option.value !== DETECT_LANGUAGE_VALUE || fg('platform_editor_code_block_ga_patch_1'))) {
+    if (commandSucceeded) {
       saveRecentLanguage(option.value);
       setRecentLanguageValues(getRecentLanguages());
     }

package/dist/es2019/ui/LanguagePicker.compiled.css

@@ -1,11 +1,7 @@
 ._h7alglyw{border-inline:none}._179rglyw{border-block-end:none}
 ._mqm2ia51{border-block-start:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
-._18m915vq{overflow-y:hidden}
 ._1bsb1osq{width:100%}
-._1bto1l2s{text-overflow:ellipsis}
-._1reo15vq{overflow-x:hidden}
 ._1xw9glyw button:after{content:none}
 ._ficf1e5h button{text-align:left}
-._o5721q9c{white-space:nowrap}
 ._p12fuuw1{max-width:200px}
 ._vwz478tn{line-height:1.714}

package/dist/es2019/ui/LanguagePicker.js

@@ -6,7 +6,6 @@ import Button from '@atlaskit/button/default/button';
 import { codeBlockButtonMessages } from '@atlaskit/editor-common/messages';
 import { akEditorLineHeight } from '@atlaskit/editor-shared-styles';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box } from '@atlaskit/primitives/compiled';
 import { PopupSelect } from '@atlaskit/select/popup-select';
 import { components } from '@atlaskit/react-select/components';
@@ -14,8 +13,7 @@ import { createGroupedLanguageOptions } from './language-picker-options';
 const pickerOptionStyles = null;
 const styles = {
   divider: "_h7alglyw _179rglyw _mqm2ia51 _1bsb1osq",
-  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw",
-  legacyTriggerTextOverflow: "_1reo15vq _18m915vq _1bto1l2s _o5721q9c"
+  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw"
 };
 const CustomGroup = props => {
   const allGroups = props.selectProps.options;
@@ -111,11 +109,7 @@ export const LanguagePicker = ({
     }
     const isSearchSelection = inputValueRef.current.trim().length > 0;
     const selectionSource = isSearchSelection ? 'search' : (_option$selectionSour = option.selectionSource) !== null && _option$selectionSour !== void 0 ? _option$selectionSour : 'all';
-    if (fg('platform_editor_code_block_ga_patch_1')) {
-      onSelection(option, selectionSource, interactionMethodRef.current);
-    } else {
-      onSelection(option, selectionSource);
-    }
+    onSelection(option, selectionSource, interactionMethodRef.current);
   }, [onSelection]);
   const handleInputChange = useCallback((newInputValue, actionMeta) => {
     // React-select clears the input as part of selecting a value before onChange fires.
@@ -134,22 +128,12 @@ export const LanguagePicker = ({
     setLockedPopperPlacement(undefined);
     onMenuOpen === null || onMenuOpen === void 0 ? void 0 : onMenuOpen();
   }, [onMenuOpen]);
-  const handleTriggerMouseDown = useCallback(event => {
-    // PopupSelect's FocusLock returns focus to the element that was focused before the
-    // picker opened. If that is the editor/code block, closing the picker can scroll the
-    // whole code block into view. Focus the trigger first without scrolling so FocusLock
-    // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
-    // editor focus.
-    focusWithoutScrolling(event.currentTarget);
-  }, []);
   const handleTriggerMouseUp = useCallback(event => {
-    if (fg('platform_editor_code_block_ga_patch_1')) {
-      interactionMethodRef.current = 'mouse';
-      // Focus the trigger before PopupSelect opens so FocusLock restores focus to the
-      // trigger after a mouse selection. Relying on the button's default mouse focus is too
-      // late here; FocusLock can still remember the code block as the previous focus target.
-      focusWithoutScrolling(event.currentTarget);
-    }
+    interactionMethodRef.current = 'mouse';
+    // Focus the trigger before PopupSelect opens so FocusLock restores focus to the
+    // trigger after a mouse selection. Relying on the button's default mouse focus is too
+    // late here; FocusLock can still remember the code block as the previous focus target.
+    focusWithoutScrolling(event.currentTarget);
   }, []);
   const handleTriggerKeyDownCapture = useCallback(() => {
     interactionMethodRef.current = 'keyboard';
@@ -162,23 +146,22 @@ export const LanguagePicker = ({
     'aria-expanded': ariaExpanded,
     'aria-haspopup': ariaHasPopup
   }) => /*#__PURE__*/React.createElement("div", {
-    className: ax([styles.trigger, !fg('platform_editor_code_block_ga_patch_1') && styles.legacyTriggerTextOverflow])
+    className: ax([styles.trigger])
   }, /*#__PURE__*/React.createElement(Button, {
     spacing: triggerSpacing,
     shouldFitContainer: true,
-    onMouseDown: fg('platform_editor_code_block_ga_patch_1') ? undefined : handleTriggerMouseDown,
-    onMouseUp: fg('platform_editor_code_block_ga_patch_1') ? handleTriggerMouseUp : undefined,
-    onKeyDownCapture: fg('platform_editor_code_block_ga_patch_1') ? handleTriggerKeyDownCapture : undefined,
+    onMouseUp: handleTriggerMouseUp,
+    onKeyDownCapture: handleTriggerKeyDownCapture,
     onKeyDown: onKeyDown,
     ref: ref,
     iconAfter: ChevronDownIcon,
     appearance: "subtle",
     isSelected: isOpen,
     "aria-controls": ariaControls,
-    "aria-expanded": fg('platform_editor_code_block_ga_patch_1') ? ariaExpanded : undefined,
-    "aria-haspopup": fg('platform_editor_code_block_ga_patch_1') ? ariaHasPopup : undefined,
+    "aria-expanded": ariaExpanded,
+    "aria-haspopup": ariaHasPopup,
     testId: "code-block-language-picker-trigger"
-  }, label)), [label, triggerSpacing, handleTriggerMouseDown, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
+  }, label)), [label, triggerSpacing, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/esm/ui/CodeBlockLanguagePicker.js

@@ -1,6 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { changeLanguage, detectLanguage } from '../editor-commands';
 import { DETECT_LANGUAGE_VALUE } from './language-picker-options';
 import { LanguagePicker } from './LanguagePicker';
@@ -26,27 +25,18 @@ export var CodeBlockLanguagePicker = function CodeBlockLanguagePicker(_ref) {
   var handleSelection = useCallback(function (option, selectionSource, interactionMethod) {
     var _api$analytics;
     var isDetectLanguageSelected = option.value === DETECT_LANGUAGE_VALUE;
-    var command = isDetectLanguageSelected && (fg('platform_editor_code_block_ga_patch_1') || fg('platform_editor_code_block_language_detection_flow')) ? detectLanguage() : changeLanguage(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
+    var command = isDetectLanguageSelected ? detectLanguage() : changeLanguage(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
     var commandSucceeded = command(editorView.state, editorView.dispatch);
-    if (fg('platform_editor_code_block_ga_patch_1')) {
-      if (interactionMethod === 'mouse') {
-        requestAnimationFrame(function () {
-          // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
-          // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
-          api === null || api === void 0 || api.core.actions.focus({
-            scrollIntoView: false
-          });
-        });
-      }
-    } else {
+    if (interactionMethod === 'mouse') {
       requestAnimationFrame(function () {
-        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+        // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
+        // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
         api === null || api === void 0 || api.core.actions.focus({
           scrollIntoView: false
         });
       });
     }
-    if (commandSucceeded && (option.value !== DETECT_LANGUAGE_VALUE || fg('platform_editor_code_block_ga_patch_1'))) {
+    if (commandSucceeded) {
       saveRecentLanguage(option.value);
       setRecentLanguageValues(getRecentLanguages());
     }

package/dist/esm/ui/LanguagePicker.compiled.css

@@ -1,11 +1,7 @@
 ._h7alglyw{border-inline:none}._179rglyw{border-block-end:none}
 ._mqm2ia51{border-block-start:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
-._18m915vq{overflow-y:hidden}
 ._1bsb1osq{width:100%}
-._1bto1l2s{text-overflow:ellipsis}
-._1reo15vq{overflow-x:hidden}
 ._1xw9glyw button:after{content:none}
 ._ficf1e5h button{text-align:left}
-._o5721q9c{white-space:nowrap}
 ._p12fuuw1{max-width:200px}
 ._vwz478tn{line-height:1.714}

package/dist/esm/ui/LanguagePicker.js

@@ -11,7 +11,6 @@ import Button from '@atlaskit/button/default/button';
 import { codeBlockButtonMessages } from '@atlaskit/editor-common/messages';
 import { akEditorLineHeight } from '@atlaskit/editor-shared-styles';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box } from '@atlaskit/primitives/compiled';
 import { PopupSelect } from '@atlaskit/select/popup-select';
 import { components } from '@atlaskit/react-select/components';
@@ -19,8 +18,7 @@ import { createGroupedLanguageOptions } from './language-picker-options';
 var pickerOptionStyles = null;
 var styles = {
   divider: "_h7alglyw _179rglyw _mqm2ia51 _1bsb1osq",
-  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw",
-  legacyTriggerTextOverflow: "_1reo15vq _18m915vq _1bto1l2s _o5721q9c"
+  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw"
 };
 var CustomGroup = function CustomGroup(props) {
   var allGroups = props.selectProps.options;
@@ -145,11 +143,7 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     }
     var isSearchSelection = inputValueRef.current.trim().length > 0;
     var selectionSource = isSearchSelection ? 'search' : (_option$selectionSour = option.selectionSource) !== null && _option$selectionSour !== void 0 ? _option$selectionSour : 'all';
-    if (fg('platform_editor_code_block_ga_patch_1')) {
-      onSelection(option, selectionSource, interactionMethodRef.current);
-    } else {
-      onSelection(option, selectionSource);
-    }
+    onSelection(option, selectionSource, interactionMethodRef.current);
   }, [onSelection]);
   var handleInputChange = useCallback(function (newInputValue, actionMeta) {
     // React-select clears the input as part of selecting a value before onChange fires.
@@ -168,22 +162,12 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     setLockedPopperPlacement(undefined);
     onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
   }, [onMenuOpen]);
-  var handleTriggerMouseDown = useCallback(function (event) {
-    // PopupSelect's FocusLock returns focus to the element that was focused before the
-    // picker opened. If that is the editor/code block, closing the picker can scroll the
-    // whole code block into view. Focus the trigger first without scrolling so FocusLock
-    // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
-    // editor focus.
-    focusWithoutScrolling(event.currentTarget);
-  }, []);
   var handleTriggerMouseUp = useCallback(function (event) {
-    if (fg('platform_editor_code_block_ga_patch_1')) {
-      interactionMethodRef.current = 'mouse';
-      // Focus the trigger before PopupSelect opens so FocusLock restores focus to the
-      // trigger after a mouse selection. Relying on the button's default mouse focus is too
-      // late here; FocusLock can still remember the code block as the previous focus target.
-      focusWithoutScrolling(event.currentTarget);
-    }
+    interactionMethodRef.current = 'mouse';
+    // Focus the trigger before PopupSelect opens so FocusLock restores focus to the
+    // trigger after a mouse selection. Relying on the button's default mouse focus is too
+    // late here; FocusLock can still remember the code block as the previous focus target.
+    focusWithoutScrolling(event.currentTarget);
   }, []);
   var handleTriggerKeyDownCapture = useCallback(function () {
     interactionMethodRef.current = 'keyboard';
@@ -196,24 +180,23 @@ export var LanguagePicker = function LanguagePicker(_ref) {
       ariaExpanded = _ref3['aria-expanded'],
       ariaHasPopup = _ref3['aria-haspopup'];
     return /*#__PURE__*/React.createElement("div", {
-      className: ax([styles.trigger, !fg('platform_editor_code_block_ga_patch_1') && styles.legacyTriggerTextOverflow])
+      className: ax([styles.trigger])
     }, /*#__PURE__*/React.createElement(Button, {
       spacing: triggerSpacing,
       shouldFitContainer: true,
-      onMouseDown: fg('platform_editor_code_block_ga_patch_1') ? undefined : handleTriggerMouseDown,
-      onMouseUp: fg('platform_editor_code_block_ga_patch_1') ? handleTriggerMouseUp : undefined,
-      onKeyDownCapture: fg('platform_editor_code_block_ga_patch_1') ? handleTriggerKeyDownCapture : undefined,
+      onMouseUp: handleTriggerMouseUp,
+      onKeyDownCapture: handleTriggerKeyDownCapture,
       onKeyDown: onKeyDown,
       ref: ref,
       iconAfter: ChevronDownIcon,
       appearance: "subtle",
       isSelected: isOpen,
       "aria-controls": ariaControls,
-      "aria-expanded": fg('platform_editor_code_block_ga_patch_1') ? ariaExpanded : undefined,
-      "aria-haspopup": fg('platform_editor_code_block_ga_patch_1') ? ariaHasPopup : undefined,
+      "aria-expanded": ariaExpanded,
+      "aria-haspopup": ariaHasPopup,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [label, triggerSpacing, handleTriggerMouseDown, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
+  }, [label, triggerSpacing, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "19.0.7",
+	"version": "19.0.10",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,13 +45,13 @@
 		"@atlaskit/prosemirror-input-rules": "^4.1.0",
 		"@atlaskit/react-select": "^4.9.0",
 		"@atlaskit/select": "^22.11.0",
-		"@atlaskit/tmp-editor-statsig": "^186.0.0",
+		"@atlaskit/tmp-editor-statsig": "^188.0.0",
 		"@atlaskit/tokens": "^16.12.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^121.4.0",
+		"@atlaskit/editor-common": "^121.5.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -65,9 +65,6 @@
 		"platform_editor_code_block_add_line_number_button": {
 			"type": "boolean"
 		},
-		"platform_editor_code_block_ga_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_code_block_language_detection_flow": {
 			"type": "boolean"
 		},