@atlaskit/editor-plugin-code-block 14.1.14 → 14.1.16

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-code-block
 
+## 14.1.16
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.1.15
+
+### Patch Changes
+
+- [`be1ffe44994f0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/be1ffe44994f0) -
+  Fix code block language picker trigger focus and overflow behavior
+- Updated dependencies
+
 ## 14.1.14
 
 ### Patch Changes

package/dist/cjs/ui/CodeBlockLanguagePicker.js

@@ -32,17 +32,29 @@ var CodeBlockLanguagePicker = exports.CodeBlockLanguagePicker = function CodeBlo
   var refreshRecentLanguages = (0, _react.useCallback)(function () {
     setRecentLanguageValues((0, _recentLanguages.getRecentLanguages)());
   }, []);
-  var handleSelection = (0, _react.useCallback)(function (option, selectionSource) {
+  var handleSelection = (0, _react.useCallback)(function (option, selectionSource, interactionMethod) {
     var _api$analytics;
     var command = option.value === _languagePickerOptions.DETECT_LANGUAGE_VALUE && (0, _platformFeatureFlags.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 commandSucceeded = command(editorView.state, editorView.dispatch);
     if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
-      requestAnimationFrame(function () {
-        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
-        api === null || api === void 0 || api.core.actions.focus({
-          scrollIntoView: false
+      if ((0, _platformFeatureFlags.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 {
+        requestAnimationFrame(function () {
+          // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+          api === null || api === void 0 || api.core.actions.focus({
+            scrollIntoView: false
+          });
         });
-      });
+      }
     }
     if (commandSucceeded && option.value !== _languagePickerOptions.DETECT_LANGUAGE_VALUE) {
       (0, _recentLanguages.saveRecentLanguage)(option.value);

package/dist/cjs/ui/LanguagePicker.js

@@ -27,7 +27,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 var pickerOptionStyles = null;
 var styles = {
   divider: "_h7alglyw _179rglyw _mqm2ia51 _1bsb1osq",
-  trigger: "_1reo15vq _18m915vq _p12fuuw1 _1bto1l2s _o5721q9c _ficf1e5h _1xw9glyw"
+  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw",
+  legacyTriggerTextOverflow: "_1reo15vq _18m915vq _1bto1l2s _o5721q9c"
 };
 var CustomGroup = function CustomGroup(props) {
   var allGroups = props.selectProps.options;
@@ -109,6 +110,10 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     lockedPopperPlacement = _useState4[0],
     setLockedPopperPlacement = _useState4[1];
   var inputValueRef = (0, _react.useRef)('');
+  // PopupSelect restores focus based on the trigger/open interaction, not the option
+  // interaction. Keep this tied to the trigger so keyboard-open + mouse-select still follows
+  // the keyboard focus path.
+  var interactionMethodRef = (0, _react.useRef)('keyboard');
   var optionsByValue = (0, _react.useMemo)(function () {
     return new Map(languagePickerOptions.map(function (option) {
       return [option.value, option];
@@ -159,7 +164,11 @@ 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';
-    onSelection(option, selectionSource);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1')) {
+      onSelection(option, selectionSource, interactionMethodRef.current);
+    } else {
+      onSelection(option, selectionSource);
+    }
   }, [onSelection]);
   var handleInputChange = (0, _react.useCallback)(function (newInputValue, actionMeta) {
     // React-select clears the input as part of selecting a value before onChange fires.
@@ -192,26 +201,44 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
       focusWithoutScrolling(event.currentTarget);
     }
   }, []);
+  var handleTriggerMouseUp = (0, _react.useCallback)(function (event) {
+    if ((0, _platformFeatureFlags.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);
+    }
+  }, []);
+  var handleTriggerKeyDownCapture = (0, _react.useCallback)(function () {
+    interactionMethodRef.current = 'keyboard';
+  }, []);
   var renderTarget = (0, _react.useCallback)(function (_ref3) {
     var isOpen = _ref3.isOpen,
       ref = _ref3.ref,
       onKeyDown = _ref3.onKeyDown,
-      ariaControls = _ref3['aria-controls'];
+      ariaControls = _ref3['aria-controls'],
+      ariaExpanded = _ref3['aria-expanded'],
+      ariaHasPopup = _ref3['aria-haspopup'];
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _runtime.ax)([styles.trigger])
+      className: (0, _runtime.ax)([styles.trigger, !(0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') && styles.legacyTriggerTextOverflow])
     }, /*#__PURE__*/_react.default.createElement(_new.default, {
       spacing: triggerSpacing,
       shouldFitContainer: true,
-      onMouseDown: handleTriggerMouseDown,
+      onMouseDown: (0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') ? undefined : handleTriggerMouseDown,
+      onMouseUp: (0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') ? handleTriggerMouseUp : undefined,
+      onKeyDownCapture: (0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') ? handleTriggerKeyDownCapture : undefined,
       onKeyDown: onKeyDown,
       ref: ref,
       iconAfter: _chevronDown.default,
       appearance: "subtle",
       isSelected: isOpen,
       "aria-controls": ariaControls,
+      "aria-expanded": (0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') ? ariaExpanded : undefined,
+      "aria-haspopup": (0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') ? ariaHasPopup : undefined,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [label, triggerSpacing, handleTriggerMouseDown]);
+  }, [label, triggerSpacing, handleTriggerMouseDown, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
   return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/es2019/ui/CodeBlockLanguagePicker.js

@@ -18,17 +18,29 @@ export const CodeBlockLanguagePicker = ({
   const refreshRecentLanguages = useCallback(() => {
     setRecentLanguageValues(getRecentLanguages());
   }, []);
-  const handleSelection = useCallback((option, selectionSource) => {
+  const handleSelection = useCallback((option, selectionSource, interactionMethod) => {
     var _api$analytics;
     const command = option.value === DETECT_LANGUAGE_VALUE && 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 commandSucceeded = command(editorView.state, editorView.dispatch);
     if (fg('platform_editor_code_block_dogfooding_patch')) {
-      requestAnimationFrame(() => {
-        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
-        api === null || api === void 0 ? void 0 : api.core.actions.focus({
-          scrollIntoView: false
+      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 {
+        requestAnimationFrame(() => {
+          // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+          api === null || api === void 0 ? void 0 : api.core.actions.focus({
+            scrollIntoView: false
+          });
         });
-      });
+      }
     }
     if (commandSucceeded && option.value !== DETECT_LANGUAGE_VALUE) {
       saveRecentLanguage(option.value);

package/dist/es2019/ui/LanguagePicker.js

@@ -13,7 +13,8 @@ import { createGroupedLanguageOptions } from './language-picker-options';
 const pickerOptionStyles = null;
 const styles = {
   divider: "_h7alglyw _179rglyw _mqm2ia51 _1bsb1osq",
-  trigger: "_1reo15vq _18m915vq _p12fuuw1 _1bto1l2s _o5721q9c _ficf1e5h _1xw9glyw"
+  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw",
+  legacyTriggerTextOverflow: "_1reo15vq _18m915vq _1bto1l2s _o5721q9c"
 };
 const CustomGroup = props => {
   const allGroups = props.selectProps.options;
@@ -79,6 +80,10 @@ export const LanguagePicker = ({
   const [hasSearchQuery, setHasSearchQuery] = useState(false);
   const [lockedPopperPlacement, setLockedPopperPlacement] = useState();
   const inputValueRef = useRef('');
+  // PopupSelect restores focus based on the trigger/open interaction, not the option
+  // interaction. Keep this tied to the trigger so keyboard-open + mouse-select still follows
+  // the keyboard focus path.
+  const interactionMethodRef = useRef('keyboard');
   const optionsByValue = useMemo(() => new Map(languagePickerOptions.map(option => [option.value, option])), [languagePickerOptions]);
   const recentlyUsedLanguages = useMemo(() => getRecentlyUsedLanguages(recentLanguageValues, optionsByValue), [recentLanguageValues, optionsByValue]);
   const options = useMemo(() => createGroupedLanguageOptions({
@@ -116,7 +121,11 @@ 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';
-    onSelection(option, selectionSource);
+    if (fg('platform_editor_code_block_ga_patch_1')) {
+      onSelection(option, selectionSource, interactionMethodRef.current);
+    } else {
+      onSelection(option, selectionSource);
+    }
   }, [onSelection]);
   const handleInputChange = useCallback((newInputValue, actionMeta) => {
     // React-select clears the input as part of selecting a value before onChange fires.
@@ -149,25 +158,43 @@ export const LanguagePicker = ({
       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);
+    }
+  }, []);
+  const handleTriggerKeyDownCapture = useCallback(() => {
+    interactionMethodRef.current = 'keyboard';
+  }, []);
   const renderTarget = useCallback(({
     isOpen,
     ref,
     onKeyDown,
-    'aria-controls': ariaControls
+    'aria-controls': ariaControls,
+    'aria-expanded': ariaExpanded,
+    'aria-haspopup': ariaHasPopup
   }) => /*#__PURE__*/React.createElement("div", {
-    className: ax([styles.trigger])
+    className: ax([styles.trigger, !fg('platform_editor_code_block_ga_patch_1') && styles.legacyTriggerTextOverflow])
   }, /*#__PURE__*/React.createElement(Button, {
     spacing: triggerSpacing,
     shouldFitContainer: true,
-    onMouseDown: handleTriggerMouseDown,
+    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,
     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,
     testId: "code-block-language-picker-trigger"
-  }, label)), [label, triggerSpacing, handleTriggerMouseDown]);
+  }, label)), [label, triggerSpacing, handleTriggerMouseDown, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

package/dist/esm/ui/CodeBlockLanguagePicker.js

@@ -23,17 +23,29 @@ export var CodeBlockLanguagePicker = function CodeBlockLanguagePicker(_ref) {
   var refreshRecentLanguages = useCallback(function () {
     setRecentLanguageValues(getRecentLanguages());
   }, []);
-  var handleSelection = useCallback(function (option, selectionSource) {
+  var handleSelection = useCallback(function (option, selectionSource, interactionMethod) {
     var _api$analytics;
     var command = option.value === DETECT_LANGUAGE_VALUE && 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 commandSucceeded = command(editorView.state, editorView.dispatch);
     if (fg('platform_editor_code_block_dogfooding_patch')) {
-      requestAnimationFrame(function () {
-        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
-        api === null || api === void 0 || api.core.actions.focus({
-          scrollIntoView: false
+      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 {
+        requestAnimationFrame(function () {
+          // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+          api === null || api === void 0 || api.core.actions.focus({
+            scrollIntoView: false
+          });
         });
-      });
+      }
     }
     if (commandSucceeded && option.value !== DETECT_LANGUAGE_VALUE) {
       saveRecentLanguage(option.value);

package/dist/esm/ui/LanguagePicker.js

@@ -18,7 +18,8 @@ import { createGroupedLanguageOptions } from './language-picker-options';
 var pickerOptionStyles = null;
 var styles = {
   divider: "_h7alglyw _179rglyw _mqm2ia51 _1bsb1osq",
-  trigger: "_1reo15vq _18m915vq _p12fuuw1 _1bto1l2s _o5721q9c _ficf1e5h _1xw9glyw"
+  trigger: "_p12fuuw1 _ficf1e5h _1xw9glyw",
+  legacyTriggerTextOverflow: "_1reo15vq _18m915vq _1bto1l2s _o5721q9c"
 };
 var CustomGroup = function CustomGroup(props) {
   var allGroups = props.selectProps.options;
@@ -100,6 +101,10 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     lockedPopperPlacement = _useState4[0],
     setLockedPopperPlacement = _useState4[1];
   var inputValueRef = useRef('');
+  // PopupSelect restores focus based on the trigger/open interaction, not the option
+  // interaction. Keep this tied to the trigger so keyboard-open + mouse-select still follows
+  // the keyboard focus path.
+  var interactionMethodRef = useRef('keyboard');
   var optionsByValue = useMemo(function () {
     return new Map(languagePickerOptions.map(function (option) {
       return [option.value, option];
@@ -150,7 +155,11 @@ 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';
-    onSelection(option, selectionSource);
+    if (fg('platform_editor_code_block_ga_patch_1')) {
+      onSelection(option, selectionSource, interactionMethodRef.current);
+    } else {
+      onSelection(option, selectionSource);
+    }
   }, [onSelection]);
   var handleInputChange = useCallback(function (newInputValue, actionMeta) {
     // React-select clears the input as part of selecting a value before onChange fires.
@@ -183,26 +192,44 @@ export var LanguagePicker = function LanguagePicker(_ref) {
       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);
+    }
+  }, []);
+  var handleTriggerKeyDownCapture = useCallback(function () {
+    interactionMethodRef.current = 'keyboard';
+  }, []);
   var renderTarget = useCallback(function (_ref3) {
     var isOpen = _ref3.isOpen,
       ref = _ref3.ref,
       onKeyDown = _ref3.onKeyDown,
-      ariaControls = _ref3['aria-controls'];
+      ariaControls = _ref3['aria-controls'],
+      ariaExpanded = _ref3['aria-expanded'],
+      ariaHasPopup = _ref3['aria-haspopup'];
     return /*#__PURE__*/React.createElement("div", {
-      className: ax([styles.trigger])
+      className: ax([styles.trigger, !fg('platform_editor_code_block_ga_patch_1') && styles.legacyTriggerTextOverflow])
     }, /*#__PURE__*/React.createElement(Button, {
       spacing: triggerSpacing,
       shouldFitContainer: true,
-      onMouseDown: handleTriggerMouseDown,
+      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,
       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,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [label, triggerSpacing, handleTriggerMouseDown]);
+  }, [label, triggerSpacing, handleTriggerMouseDown, handleTriggerMouseUp, handleTriggerKeyDownCapture]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,

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

@@ -2,7 +2,7 @@ import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CodeBlockPlugin } from '../index';
-import type { LanguagePickerProps } from './LanguagePicker';
+import { type LanguagePickerProps } from './LanguagePicker';
 type CodeBlockLanguagePickerProps = Omit<LanguagePickerProps, 'recentLanguageValues' | 'onMenuOpen' | 'onSelection'> & {
     api: ExtractInjectionAPI<CodeBlockPlugin> | undefined;
     editorView: EditorView;

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

@@ -12,8 +12,9 @@ export type LanguagePickerProps = {
     formatMessage: IntlShape['formatMessage'];
     languagePickerOptions: LanguagePickerOption[];
     onMenuOpen?: () => void;
-    onSelection: (option: LanguagePickerOption, selectionSource: LanguagePickerSelectionSource) => void;
+    onSelection: (option: LanguagePickerOption, selectionSource: LanguagePickerSelectionSource, interactionMethod?: LanguagePickerInteractionMethod) => void;
     recentLanguageValues?: string[];
     triggerSpacing?: 'default' | 'compact';
 };
+export type LanguagePickerInteractionMethod = 'keyboard' | 'mouse';
 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.14",
+	"version": "14.1.16",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -19,7 +19,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^56.0.0",
+		"@atlaskit/adf-schema": "^56.1.0",
 		"@atlaskit/button": "^24.3.0",
 		"@atlaskit/code": "^18.2.0",
 		"@atlaskit/css": "^1.0.0",
@@ -39,16 +39,16 @@
 		"@atlaskit/frontend-utilities": "^4.1.0",
 		"@atlaskit/icon": "^36.2.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/primitives": "^20.3.0",
+		"@atlaskit/primitives": "^20.5.0",
 		"@atlaskit/prosemirror-input-rules": "^4.0.0",
-		"@atlaskit/select": "^22.3.0",
-		"@atlaskit/tmp-editor-statsig": "^121.0.0",
-		"@atlaskit/tokens": "^15.4.0",
+		"@atlaskit/select": "^22.4.0",
+		"@atlaskit/tmp-editor-statsig": "^122.0.0",
+		"@atlaskit/tokens": "^15.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.22.0",
+		"@atlaskit/editor-common": "^116.24.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -106,6 +106,9 @@
 		"platform_editor_code_block_dogfooding_patch": {
 			"type": "boolean"
 		},
+		"platform_editor_code_block_ga_patch_1": {
+			"type": "boolean"
+		},
 		"platform_editor_code_block_language_detection_flow": {
 			"type": "boolean"
 		}