@atlaskit/editor-plugin-code-block 14.0.6 → 14.1.1

package/dist/es2019/ui/CodeBlockMenuItem.js

@@ -6,7 +6,8 @@ import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
 const NODE_NAME = 'codeBlock';
 const CodeBlockMenuItem = ({
-  api
+  api,
+  isSuggested
 }) => {
   const {
     formatMessage
@@ -20,6 +21,7 @@ const CodeBlockMenuItem = ({
       var _api$blockMenu;
       const command = api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.transformNode(tr.doc.type.schema.nodes.codeBlock, {
         inputMethod,
+        isSuggested,
         triggeredFrom,
         targetTypeName: NODE_NAME
       });
@@ -37,7 +39,10 @@ const CodeBlockMenuItem = ({
   }, formatMessage(blockMenuMessages.codeBlock));
 };
 export const createCodeBlockMenuItem = api => {
-  return () => /*#__PURE__*/React.createElement(CodeBlockMenuItem, {
-    api: api
+  return ({
+    isSuggested
+  } = {}) => /*#__PURE__*/React.createElement(CodeBlockMenuItem, {
+    api: api,
+    isSuggested: isSuggested
   });
 };

package/dist/es2019/ui/LanguagePicker.js

@@ -6,6 +6,7 @@ import Button from '@atlaskit/button/new';
 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';
 import { Box } from '@atlaskit/primitives/compiled';
 import { PopupSelect, components } from '@atlaskit/select';
 import { createGroupedLanguageOptions } from './language-picker-options';
@@ -47,6 +48,11 @@ const menuPopperProps = {
     enabled: false
   }]
 };
+const focusWithoutScrolling = element => {
+  element.focus({
+    preventScroll: true
+  });
+};
 const getRecentlyUsedLanguages = (recentLanguageValues, optionsByValue) => {
   const recentlyUsedLanguages = [];
   for (const recentLanguageValue of recentLanguageValues) {
@@ -64,12 +70,14 @@ 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);
   const selectLanguageLabel = formatMessage(codeBlockButtonMessages.selectLanguage);
   const [hasSearchQuery, setHasSearchQuery] = useState(false);
+  const [lockedPopperPlacement, setLockedPopperPlacement] = useState();
   const inputValueRef = useRef('');
   const optionsByValue = useMemo(() => new Map(languagePickerOptions.map(option => [option.value, option])), [languagePickerOptions]);
   const recentlyUsedLanguages = useMemo(() => getRecentlyUsedLanguages(recentLanguageValues, optionsByValue), [recentLanguageValues, optionsByValue]);
@@ -79,6 +87,28 @@ export const LanguagePicker = ({
     recentlyUsedLanguages
   }), [formatMessage, languagePickerOptions, recentlyUsedLanguages]);
   const searchOptions = useMemo(() => options.flatMap(group => group.options), [options]);
+  const stableMenuPopperProps = useMemo(() => ({
+    // Allow Popper to choose top on the first open when bottom has no room, then lock the
+    // chosen placement so later hover/search renders do not move the open picker.
+    placement: lockedPopperPlacement !== null && lockedPopperPlacement !== void 0 ? lockedPopperPlacement : 'bottom-start',
+    modifiers: [{
+      name: 'offset',
+      options: {
+        offset: [0, 8]
+      }
+    }, {
+      name: 'preventOverflow',
+      enabled: false
+    }, ...(lockedPopperPlacement ? [{
+      name: 'flip',
+      enabled: false
+    }] : [])],
+    onFirstUpdate: ({
+      placement
+    }) => {
+      setLockedPopperPlacement(placement);
+    }
+  }), [lockedPopperPlacement]);
   const handleChange = useCallback(option => {
     var _option$selectionSour;
     if (!option) {
@@ -91,11 +121,33 @@ export const LanguagePicker = ({
   const handleInputChange = useCallback((newInputValue, actionMeta) => {
     // React-select clears the input as part of selecting a value before onChange fires.
     // Keep the last user-typed query so handleChange can report search selections correctly.
-    if (!actionMeta || actionMeta.action === 'input-change') {
+    const isInputChange = !actionMeta || actionMeta.action === 'input-change';
+    if (isInputChange) {
       inputValueRef.current = newInputValue;
     }
-    setHasSearchQuery(newInputValue.trim().length > 0);
-    return newInputValue;
+    if (isInputChange || !fg('platform_editor_code_block_dogfooding_patch')) {
+      setHasSearchQuery(newInputValue.trim().length > 0);
+      return newInputValue;
+    }
+    return inputValueRef.current;
+  }, []);
+  const handleMenuOpen = useCallback(() => {
+    if (fg('platform_editor_code_block_dogfooding_patch')) {
+      inputValueRef.current = '';
+      setHasSearchQuery(false);
+      setLockedPopperPlacement(undefined);
+    }
+    onMenuOpen === null || onMenuOpen === void 0 ? void 0 : onMenuOpen();
+  }, [onMenuOpen]);
+  const handleTriggerMouseDown = useCallback(event => {
+    if (fg('platform_editor_code_block_dogfooding_patch')) {
+      // 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 renderTarget = useCallback(({
     isOpen,
@@ -105,7 +157,9 @@ export const LanguagePicker = ({
   }) => /*#__PURE__*/React.createElement("div", {
     className: ax([styles.trigger])
   }, /*#__PURE__*/React.createElement(Button, {
+    spacing: triggerSpacing,
     shouldFitContainer: true,
+    onMouseDown: handleTriggerMouseDown,
     onKeyDown: onKeyDown,
     ref: ref,
     iconAfter: ChevronDownIcon,
@@ -113,7 +167,7 @@ export const LanguagePicker = ({
     isSelected: isOpen,
     "aria-controls": ariaControls,
     testId: "code-block-language-picker-trigger"
-  }, label)), [label]);
+  }, label)), [label, triggerSpacing, handleTriggerMouseDown]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,
@@ -123,9 +177,9 @@ export const LanguagePicker = ({
     menuPlacement: "auto",
     onChange: handleChange,
     onInputChange: handleInputChange,
-    onMenuOpen: onMenuOpen,
+    onMenuOpen: handleMenuOpen,
     options: hasSearchQuery ? searchOptions : options,
-    popperProps: menuPopperProps,
+    popperProps: fg('platform_editor_code_block_dogfooding_patch') ? stableMenuPopperProps : menuPopperProps,
     searchThreshold: -1,
     target: renderTarget,
     testId: "code-block-language-picker",

package/dist/es2019/utils/auto-detect-view.js

@@ -1,4 +1,5 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTIONS } from '../pm-plugins/actions';
 import { autoDetectPluginKey } from '../pm-plugins/auto-detect-state';
 import { createAutoDetectEntry } from './auto-detect-state';
@@ -32,6 +33,7 @@ const runPendingDetection = (view, localId, api) => {
   }
   const detectedLanguage = detectLanguage(found.node.textContent);
   const detectionResult = detectedLanguage ? 'detected' : 'noneDetected';
+  const detectionPhase = entry.detectionResult ? 'redetection' : 'initial';
   // Keep a previous auto-detected language when the latest snippet is too weak to classify.
   const shouldPreserveAutoDetectedLanguage = !detectedLanguage && Boolean(entry.autoDetectedLanguage) && found.node.attrs.language === entry.autoDetectedLanguage;
   const nextEntry = {
@@ -42,11 +44,13 @@ const runPendingDetection = (view, localId, api) => {
 
   // If there is no confident detection, record the result without clearing user-visible language.
   const shouldOnlyUpdateDetectionState = !detectedLanguage && (!found.node.attrs.language || shouldPreserveAutoDetectedLanguage);
+  const hasDetectedLanguageChange = Boolean(detectedLanguage) && found.node.attrs.language !== detectedLanguage;
+  const shouldClearStaleLanguage = !detectedLanguage && Boolean(found.node.attrs.language) && !shouldPreserveAutoDetectedLanguage;
+  const shouldUpdateNodeLanguage = fg('platform_editor_code_block_dogfooding_patch') ? hasDetectedLanguageChange || shouldClearStaleLanguage : !shouldOnlyUpdateDetectionState;
   api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
     tr
   }) => {
-    var _api$analytics;
-    if (!shouldOnlyUpdateDetectionState) {
+    if (shouldUpdateNodeLanguage) {
       tr.setNodeMarkup(found.pos, undefined, {
         ...found.node.attrs,
         language: detectedLanguage
@@ -59,15 +63,22 @@ const runPendingDetection = (view, localId, api) => {
         entry: nextEntry
       }
     });
-    api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
-      action: ACTION.LANGUAGE_AUTO_DETECTED,
-      actionSubject: ACTION_SUBJECT.CODE_BLOCK,
-      attributes: {
-        language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
-        detectionResult
-      },
-      eventType: EVENT_TYPE.TRACK
-    })(tr);
+    // When platform_editor_code_block_dogfooding_patch is cleaned up, merge this with the previous shouldUpdateNodeLanguage check.
+    if (!fg('platform_editor_code_block_dogfooding_patch') || shouldUpdateNodeLanguage) {
+      var _api$analytics;
+      api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
+        action: ACTION.LANGUAGE_AUTO_DETECTED,
+        actionSubject: ACTION_SUBJECT.CODE_BLOCK,
+        attributes: {
+          language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
+          detectionResult,
+          ...(fg('platform_editor_code_block_dogfooding_patch') ? {
+            detectionPhase
+          } : {})
+        },
+        eventType: EVENT_TYPE.TRACK
+      })(tr);
+    }
     // Language detection runs in the background and should not move the viewport.
     return tr.setMeta('scrollIntoView', false);
   });

package/dist/es2019/utils/language-detect.js

@@ -1,5 +1,5 @@
 /* eslint-disable require-unicode-regexp */
-
+import { fg } from '@atlaskit/platform-feature-flags';
 // Conservative weighted-regex heuristic for common high-confidence snippets, not a full classifier.
 // Ambiguous snippets intentionally return null so users can select the language manually.
 const MAX_DETECTION_CHARS = 10_000;
@@ -12,6 +12,7 @@ const hasPattern = (code, pattern) => {
   return pattern.test(code);
 };
 const scorePatterns = (code, patterns) => patterns.reduce((score, [pattern, value]) => score + (hasPattern(code, pattern) ? value : 0), 0);
+const scoreEnhancedTypeScriptPatterns = code => fg('platform_editor_code_block_dogfooding_patch') ? scorePatterns(code, [[/\b(?:private|protected|public|readonly)\s+[\w$]+\s*=/, 5], [/\([^)]{0,500}\b[\w$]+\??:\s*[A-Za-z_$][\w$<>{}\[\]|&,\s.?]{0,200}[^)]{0,500}\)\s*(?::\s*[A-Za-z_$][\w$<>{}\[\]|&,\s.?]{0,200})?\s*=>/, 5]]) : 0;
 const looksLikeHtmlTagPair = code => {
   const openTags = new Set();
   const tagPattern = /<\/?([a-z][a-z0-9-]*)\b[^<>]{0,500}>/gi;
@@ -57,7 +58,7 @@ const getLanguageScores = code => [{
   score: scorePatterns(code, [[/\bSELECT\b[\s\S]+\bFROM\b/i, 5], [/\b(?:INSERT\s+INTO|UPDATE\b[\s\S]+\bSET\b|DELETE\s+FROM|CREATE\s+TABLE|ALTER\s+TABLE)\b/i, 5], [/\b(?:JOIN|WHERE|GROUP\s+BY|ORDER\s+BY|LIMIT)\b/i, 2]])
 }, {
   language: 'typescript',
-  score: scorePatterns(code, [[/\b(?:interface|type)\s+[A-Z_$][\w$]*(?:\s*[=<{])/, 5], [/\bimport\s+type\b|\bexport\s+type\b/, 4], [/\b(?:const|let|var)\s+[\w$]+\s*:\s*[A-Za-z_$][\w$<>|\[\],\s]*/, 4], [/\)\s*:\s*(?:Promise<)?[A-Za-z_$][\w$<>|\[\],\s]*(?:>|\s)?\s*=>?\s*[{;]/, 3], [/\b(?:as\s+const|implements\s+[A-Z_$]|enum\s+[A-Z_$])/, 3]])
+  score: scorePatterns(code, [[/\b(?:interface|type)\s+[A-Z_$][\w$]*(?:\s*[=<{])/, 5], [/\bimport\s+type\b|\bexport\s+type\b/, 4], [/\b(?:const|let|var)\s+[\w$]+\s*:\s*[A-Za-z_$][\w$<>|\[\],\s]*/, 4], [/\)\s*:\s*(?:Promise<)?[A-Za-z_$][\w$<>|\[\],\s]*(?:>|\s)?\s*=>?\s*[{;]/, 3], [/\b(?:as\s+const|implements\s+[A-Z_$]|enum\s+[A-Z_$])/, 3]]) + scoreEnhancedTypeScriptPatterns(code)
 }, {
   language: 'javascript',
   score: scorePatterns(code, [[/\b(?:const|let|var)\s+[\w$]+\s*=/, 3], [/\bfunction\s*[\w$]*\s*\([^)]*\)\s*\{/, 3], [/=>\s*(?:\{|[\w$'"`(])/, 3], [/\b(?:import|export)\s+(?:[\w${}*,\s]+\s+from\s+)?['"][^'"]+['"]/, 3], [/\b(?:console\.log|document\.|window\.|require\()|\bmodule\.exports\b/, 3]])

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/editor-commands/index.js

@@ -472,6 +472,9 @@ export var toggleWordWrapStateForCodeBlockNode = function toggleWordWrapStateFor
       tr.setNodeMarkup(codeBlock.pos, undefined, _objectSpread(_objectSpread({}, codeBlockNode.attrs), {}, {
         wrap: updatedToggleState
       }));
+      if (fg('platform_editor_code_block_dogfooding_patch')) {
+        tr.setMeta('scrollIntoView', false);
+      }
     } else {
       codeBlockWrappedStates.set(codeBlockNode, updatedToggleState);
     }

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();
     }),
@@ -26,11 +27,19 @@ export var CodeBlockLanguagePicker = function CodeBlockLanguagePicker(_ref) {
     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 (commandSucceeded && option.value !== DETECT_LANGUAGE_VALUE) {
       saveRecentLanguage(option.value);
       setRecentLanguageValues(getRecentLanguages());
     }
-  }, [api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, editorView]);
+  }, [api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api === null || api === void 0 ? void 0 : api.core.actions, editorView]);
   return /*#__PURE__*/React.createElement(LanguagePicker, {
     defaultValue: defaultValue,
     filterOption: filterOption,
@@ -38,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/CodeBlockMenuItem.js

@@ -6,7 +6,8 @@ import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
 var NODE_NAME = 'codeBlock';
 var CodeBlockMenuItem = function CodeBlockMenuItem(_ref) {
-  var api = _ref.api;
+  var api = _ref.api,
+    isSuggested = _ref.isSuggested;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var handleClick = function handleClick(event) {
@@ -17,6 +18,7 @@ var CodeBlockMenuItem = function CodeBlockMenuItem(_ref) {
       var tr = _ref2.tr;
       var command = api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.transformNode(tr.doc.type.schema.nodes.codeBlock, {
         inputMethod: inputMethod,
+        isSuggested: isSuggested,
         triggeredFrom: triggeredFrom,
         targetTypeName: NODE_NAME
       });
@@ -35,8 +37,11 @@ var CodeBlockMenuItem = function CodeBlockMenuItem(_ref) {
 };
 export var createCodeBlockMenuItem = function createCodeBlockMenuItem(api) {
   return function () {
+    var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      isSuggested = _ref3.isSuggested;
     return /*#__PURE__*/React.createElement(CodeBlockMenuItem, {
-      api: api
+      api: api,
+      isSuggested: isSuggested
     });
   };
 };

package/dist/esm/ui/LanguagePicker.js

@@ -1,4 +1,5 @@
 /* LanguagePicker.tsx generated by @compiled/babel-plugin v0.39.1 */
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./LanguagePicker.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
@@ -10,6 +11,7 @@ import Button from '@atlaskit/button/new';
 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';
 import { Box } from '@atlaskit/primitives/compiled';
 import { PopupSelect, components } from '@atlaskit/select';
 import { createGroupedLanguageOptions } from './language-picker-options';
@@ -51,6 +53,11 @@ var menuPopperProps = {
     enabled: false
   }]
 };
+var focusWithoutScrolling = function focusWithoutScrolling(element) {
+  element.focus({
+    preventScroll: true
+  });
+};
 var getRecentlyUsedLanguages = function getRecentlyUsedLanguages(recentLanguageValues, optionsByValue) {
   var recentlyUsedLanguages = [];
   var _iterator = _createForOfIteratorHelper(recentLanguageValues),
@@ -79,13 +86,19 @@ 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),
     _useState2 = _slicedToArray(_useState, 2),
     hasSearchQuery = _useState2[0],
     setHasSearchQuery = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    lockedPopperPlacement = _useState4[0],
+    setLockedPopperPlacement = _useState4[1];
   var inputValueRef = useRef('');
   var optionsByValue = useMemo(function () {
     return new Map(languagePickerOptions.map(function (option) {
@@ -107,6 +120,29 @@ export var LanguagePicker = function LanguagePicker(_ref) {
       return group.options;
     });
   }, [options]);
+  var stableMenuPopperProps = useMemo(function () {
+    return {
+      // Allow Popper to choose top on the first open when bottom has no room, then lock the
+      // chosen placement so later hover/search renders do not move the open picker.
+      placement: lockedPopperPlacement !== null && lockedPopperPlacement !== void 0 ? lockedPopperPlacement : 'bottom-start',
+      modifiers: [{
+        name: 'offset',
+        options: {
+          offset: [0, 8]
+        }
+      }, {
+        name: 'preventOverflow',
+        enabled: false
+      }].concat(_toConsumableArray(lockedPopperPlacement ? [{
+        name: 'flip',
+        enabled: false
+      }] : [])),
+      onFirstUpdate: function onFirstUpdate(_ref2) {
+        var placement = _ref2.placement;
+        setLockedPopperPlacement(placement);
+      }
+    };
+  }, [lockedPopperPlacement]);
   var handleChange = useCallback(function (option) {
     var _option$selectionSour;
     if (!option) {
@@ -119,21 +155,45 @@ export var LanguagePicker = function LanguagePicker(_ref) {
   var handleInputChange = useCallback(function (newInputValue, actionMeta) {
     // React-select clears the input as part of selecting a value before onChange fires.
     // Keep the last user-typed query so handleChange can report search selections correctly.
-    if (!actionMeta || actionMeta.action === 'input-change') {
+    var isInputChange = !actionMeta || actionMeta.action === 'input-change';
+    if (isInputChange) {
       inputValueRef.current = newInputValue;
     }
-    setHasSearchQuery(newInputValue.trim().length > 0);
-    return newInputValue;
+    if (isInputChange || !fg('platform_editor_code_block_dogfooding_patch')) {
+      setHasSearchQuery(newInputValue.trim().length > 0);
+      return newInputValue;
+    }
+    return inputValueRef.current;
+  }, []);
+  var handleMenuOpen = useCallback(function () {
+    if (fg('platform_editor_code_block_dogfooding_patch')) {
+      inputValueRef.current = '';
+      setHasSearchQuery(false);
+      setLockedPopperPlacement(undefined);
+    }
+    onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
+  }, [onMenuOpen]);
+  var handleTriggerMouseDown = useCallback(function (event) {
+    if (fg('platform_editor_code_block_dogfooding_patch')) {
+      // 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 renderTarget = useCallback(function (_ref2) {
-    var isOpen = _ref2.isOpen,
-      ref = _ref2.ref,
-      onKeyDown = _ref2.onKeyDown,
-      ariaControls = _ref2['aria-controls'];
+  var renderTarget = useCallback(function (_ref3) {
+    var isOpen = _ref3.isOpen,
+      ref = _ref3.ref,
+      onKeyDown = _ref3.onKeyDown,
+      ariaControls = _ref3['aria-controls'];
     return /*#__PURE__*/React.createElement("div", {
       className: ax([styles.trigger])
     }, /*#__PURE__*/React.createElement(Button, {
+      spacing: triggerSpacing,
       shouldFitContainer: true,
+      onMouseDown: handleTriggerMouseDown,
       onKeyDown: onKeyDown,
       ref: ref,
       iconAfter: ChevronDownIcon,
@@ -142,7 +202,7 @@ export var LanguagePicker = function LanguagePicker(_ref) {
       "aria-controls": ariaControls,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [label]);
+  }, [label, triggerSpacing, handleTriggerMouseDown]);
   return /*#__PURE__*/React.createElement(PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,
@@ -152,9 +212,9 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     menuPlacement: "auto",
     onChange: handleChange,
     onInputChange: handleInputChange,
-    onMenuOpen: onMenuOpen,
+    onMenuOpen: handleMenuOpen,
     options: hasSearchQuery ? searchOptions : options,
-    popperProps: menuPopperProps,
+    popperProps: fg('platform_editor_code_block_dogfooding_patch') ? stableMenuPopperProps : menuPopperProps,
     searchThreshold: -1,
     target: renderTarget,
     testId: "code-block-language-picker",

package/dist/esm/utils/auto-detect-view.js

@@ -3,6 +3,7 @@ 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 { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTIONS } from '../pm-plugins/actions';
 import { autoDetectPluginKey } from '../pm-plugins/auto-detect-state';
 import { createAutoDetectEntry } from './auto-detect-state';
@@ -36,6 +37,7 @@ var runPendingDetection = function runPendingDetection(view, localId, api) {
   }
   var detectedLanguage = detectLanguage(found.node.textContent);
   var detectionResult = detectedLanguage ? 'detected' : 'noneDetected';
+  var detectionPhase = entry.detectionResult ? 'redetection' : 'initial';
   // Keep a previous auto-detected language when the latest snippet is too weak to classify.
   var shouldPreserveAutoDetectedLanguage = !detectedLanguage && Boolean(entry.autoDetectedLanguage) && found.node.attrs.language === entry.autoDetectedLanguage;
   var nextEntry = _objectSpread(_objectSpread({}, createAutoDetectEntry(found.node, found.pos, false, entry)), {}, {
@@ -45,10 +47,12 @@ var runPendingDetection = function runPendingDetection(view, localId, api) {
 
   // If there is no confident detection, record the result without clearing user-visible language.
   var shouldOnlyUpdateDetectionState = !detectedLanguage && (!found.node.attrs.language || shouldPreserveAutoDetectedLanguage);
+  var hasDetectedLanguageChange = Boolean(detectedLanguage) && found.node.attrs.language !== detectedLanguage;
+  var shouldClearStaleLanguage = !detectedLanguage && Boolean(found.node.attrs.language) && !shouldPreserveAutoDetectedLanguage;
+  var shouldUpdateNodeLanguage = fg('platform_editor_code_block_dogfooding_patch') ? hasDetectedLanguageChange || shouldClearStaleLanguage : !shouldOnlyUpdateDetectionState;
   api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref) {
-    var _api$analytics;
     var tr = _ref.tr;
-    if (!shouldOnlyUpdateDetectionState) {
+    if (shouldUpdateNodeLanguage) {
       tr.setNodeMarkup(found.pos, undefined, _objectSpread(_objectSpread({}, found.node.attrs), {}, {
         language: detectedLanguage
       }), found.node.marks);
@@ -60,15 +64,21 @@ var runPendingDetection = function runPendingDetection(view, localId, api) {
         entry: nextEntry
       }
     });
-    api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
-      action: ACTION.LANGUAGE_AUTO_DETECTED,
-      actionSubject: ACTION_SUBJECT.CODE_BLOCK,
-      attributes: {
-        language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
-        detectionResult: detectionResult
-      },
-      eventType: EVENT_TYPE.TRACK
-    })(tr);
+    // When platform_editor_code_block_dogfooding_patch is cleaned up, merge this with the previous shouldUpdateNodeLanguage check.
+    if (!fg('platform_editor_code_block_dogfooding_patch') || shouldUpdateNodeLanguage) {
+      var _api$analytics;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
+        action: ACTION.LANGUAGE_AUTO_DETECTED,
+        actionSubject: ACTION_SUBJECT.CODE_BLOCK,
+        attributes: _objectSpread({
+          language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
+          detectionResult: detectionResult
+        }, fg('platform_editor_code_block_dogfooding_patch') ? {
+          detectionPhase: detectionPhase
+        } : {}),
+        eventType: EVENT_TYPE.TRACK
+      })(tr);
+    }
     // Language detection runs in the background and should not move the viewport.
     return tr.setMeta('scrollIntoView', false);
   });