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

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/editor-plugin-code-block
 
+## 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
+
+- [`b483e293da76f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b483e293da76f) -
+  Add a gated `isSuggested` attribute to block menu element transformed analytics events so
+  suggested and non-suggested transform selections can be distinguished. The event attribute is
+  gated behind the `platform_editor_blocks_patch_2` feature gate.
+
+### Patch Changes
+
+- [`64a0b50380570`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/64a0b50380570) - -
+  Improve TypeScript auto-detection for class fields and typed arrow function params/return types.
+  - Avoid unnecessary code block node updates when auto-detection re-detects the same language.
+  - Prevent wrap toggles from scrolling long code blocks to the top.
+  - Keep the language picker placement stable while it is open.
+  - Reset language picker search state on reopen so recent selections are not reported as search
+    selections.
+  - Prevent language picker close/selection from scrolling partially visible code blocks while
+    restoring editor focus.
+  - Add auto-detection analytics metadata to distinguish initial detection from re-detection.
+- Updated dependencies
+
 ## 14.0.6
 
 ### Patch 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/editor-commands/index.js

@@ -483,6 +483,9 @@ var toggleWordWrapStateForCodeBlockNode = exports.toggleWordWrapStateForCodeBloc
       tr.setNodeMarkup(codeBlock.pos, undefined, _objectSpread(_objectSpread({}, codeBlockNode.attrs), {}, {
         wrap: updatedToggleState
       }));
+      if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
+        tr.setMeta('scrollIntoView', false);
+      }
     } else {
       _codeBlock.codeBlockWrappedStates.set(codeBlockNode, updatedToggleState);
     }

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)();
     }),
@@ -35,11 +36,19 @@ var CodeBlockLanguagePicker = exports.CodeBlockLanguagePicker = function CodeBlo
     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 (commandSucceeded && option.value !== _languagePickerOptions.DETECT_LANGUAGE_VALUE) {
       (0, _recentLanguages.saveRecentLanguage)(option.value);
       setRecentLanguageValues((0, _recentLanguages.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.default.createElement(_LanguagePicker.LanguagePicker, {
     defaultValue: defaultValue,
     filterOption: filterOption,
@@ -47,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/CodeBlockMenuItem.js

@@ -13,7 +13,8 @@ var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _angleBrackets = _interopRequireDefault(require("@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 = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var handleClick = function handleClick(event) {
@@ -24,6 +25,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
       });
@@ -42,8 +44,11 @@ var CodeBlockMenuItem = function CodeBlockMenuItem(_ref) {
 };
 var createCodeBlockMenuItem = exports.createCodeBlockMenuItem = function createCodeBlockMenuItem(api) {
   return function () {
+    var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      isSuggested = _ref3.isSuggested;
     return /*#__PURE__*/_react.default.createElement(CodeBlockMenuItem, {
-      api: api
+      api: api,
+      isSuggested: isSuggested
     });
   };
 };

package/dist/cjs/ui/LanguagePicker.js

@@ -9,12 +9,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.LanguagePicker = void 0;
 require("./LanguagePicker.compiled.css");
 var _runtime = require("@compiled/react/runtime");
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _select = require("@atlaskit/select");
 var _languagePickerOptions = require("./language-picker-options");
@@ -60,6 +62,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),
@@ -88,13 +95,19 @@ 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),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     hasSearchQuery = _useState2[0],
     setHasSearchQuery = _useState2[1];
+  var _useState3 = (0, _react.useState)(),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    lockedPopperPlacement = _useState4[0],
+    setLockedPopperPlacement = _useState4[1];
   var inputValueRef = (0, _react.useRef)('');
   var optionsByValue = (0, _react.useMemo)(function () {
     return new Map(languagePickerOptions.map(function (option) {
@@ -116,6 +129,29 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
       return group.options;
     });
   }, [options]);
+  var stableMenuPopperProps = (0, _react.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((0, _toConsumableArray2.default)(lockedPopperPlacement ? [{
+        name: 'flip',
+        enabled: false
+      }] : [])),
+      onFirstUpdate: function onFirstUpdate(_ref2) {
+        var placement = _ref2.placement;
+        setLockedPopperPlacement(placement);
+      }
+    };
+  }, [lockedPopperPlacement]);
   var handleChange = (0, _react.useCallback)(function (option) {
     var _option$selectionSour;
     if (!option) {
@@ -128,21 +164,45 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
   var handleInputChange = (0, _react.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 || !(0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
+      setHasSearchQuery(newInputValue.trim().length > 0);
+      return newInputValue;
+    }
+    return inputValueRef.current;
+  }, []);
+  var handleMenuOpen = (0, _react.useCallback)(function () {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
+      inputValueRef.current = '';
+      setHasSearchQuery(false);
+      setLockedPopperPlacement(undefined);
+    }
+    onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
+  }, [onMenuOpen]);
+  var handleTriggerMouseDown = (0, _react.useCallback)(function (event) {
+    if ((0, _platformFeatureFlags.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 = (0, _react.useCallback)(function (_ref2) {
-    var isOpen = _ref2.isOpen,
-      ref = _ref2.ref,
-      onKeyDown = _ref2.onKeyDown,
-      ariaControls = _ref2['aria-controls'];
+  var renderTarget = (0, _react.useCallback)(function (_ref3) {
+    var isOpen = _ref3.isOpen,
+      ref = _ref3.ref,
+      onKeyDown = _ref3.onKeyDown,
+      ariaControls = _ref3['aria-controls'];
     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,
       ref: ref,
       iconAfter: _chevronDown.default,
@@ -151,7 +211,7 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
       "aria-controls": ariaControls,
       testId: "code-block-language-picker-trigger"
     }, label));
-  }, [label]);
+  }, [label, triggerSpacing, handleTriggerMouseDown]);
   return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
     components: popupSelectComponents,
     filterOption: filterOption,
@@ -161,9 +221,9 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     menuPlacement: "auto",
     onChange: handleChange,
     onInputChange: handleInputChange,
-    onMenuOpen: onMenuOpen,
+    onMenuOpen: handleMenuOpen,
     options: hasSearchQuery ? searchOptions : options,
-    popperProps: menuPopperProps,
+    popperProps: (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? stableMenuPopperProps : menuPopperProps,
     searchThreshold: -1,
     target: renderTarget,
     testId: "code-block-language-picker",

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

@@ -8,6 +8,7 @@ exports.syncPendingDetectionTimers = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../pm-plugins/actions");
 var _autoDetectState = require("../pm-plugins/auto-detect-state");
 var _autoDetectState2 = require("./auto-detect-state");
@@ -43,6 +44,7 @@ var runPendingDetection = function runPendingDetection(view, localId, api) {
   }
   var detectedLanguage = (0, _languageDetect.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({}, (0, _autoDetectState2.createAutoDetectEntry)(found.node, found.pos, false, entry)), {}, {
@@ -52,10 +54,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 = (0, _platformFeatureFlags.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);
@@ -67,15 +71,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: _analytics.ACTION.LANGUAGE_AUTO_DETECTED,
-      actionSubject: _analytics.ACTION_SUBJECT.CODE_BLOCK,
-      attributes: {
-        language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
-        detectionResult: detectionResult
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    })(tr);
+    // When platform_editor_code_block_dogfooding_patch is cleaned up, merge this with the previous shouldUpdateNodeLanguage check.
+    if (!(0, _platformFeatureFlags.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: _analytics.ACTION.LANGUAGE_AUTO_DETECTED,
+        actionSubject: _analytics.ACTION_SUBJECT.CODE_BLOCK,
+        attributes: _objectSpread({
+          language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
+          detectionResult: detectionResult
+        }, (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? {
+          detectionPhase: detectionPhase
+        } : {}),
+        eventType: _analytics.EVENT_TYPE.TRACK
+      })(tr);
+    }
     // Language detection runs in the background and should not move the viewport.
     return tr.setMeta('scrollIntoView', false);
   });

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.detectLanguage = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /* eslint-disable require-unicode-regexp */
 
 // Conservative weighted-regex heuristic for common high-confidence snippets, not a full classifier.
@@ -28,6 +29,9 @@ var scorePatterns = function scorePatterns(code, patterns) {
     return score + (hasPattern(code, pattern) ? value : 0);
   }, 0);
 };
+var scoreEnhancedTypeScriptPatterns = function scoreEnhancedTypeScriptPatterns(code) {
+  return (0, _platformFeatureFlags.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;
+};
 var looksLikeHtmlTagPair = function looksLikeHtmlTagPair(code) {
   var openTags = new Set();
   var tagPattern = /<\/?([a-z][a-z0-9-]*)\b[^<>]{0,500}>/gi;
@@ -77,7 +81,7 @@ var getLanguageScores = function 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/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/editor-commands/index.js

@@ -492,6 +492,9 @@ export const toggleWordWrapStateForCodeBlockNode = editorAnalyticsAPI => (state,
       ...codeBlockNode.attrs,
       wrap: updatedToggleState
     });
+    if (fg('platform_editor_code_block_dogfooding_patch')) {
+      tr.setMeta('scrollIntoView', false);
+    }
   } else {
     codeBlockWrappedStates.set(codeBlockNode, updatedToggleState);
   }

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());
@@ -21,11 +22,19 @@ export const CodeBlockLanguagePicker = ({
     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 (commandSucceeded && option.value !== DETECT_LANGUAGE_VALUE) {
       saveRecentLanguage(option.value);
       setRecentLanguageValues(getRecentLanguages());
     }
-  }, [api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, editorView]);
+  }, [api === null || api === void 0 ? 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,
@@ -33,6 +42,7 @@ export const CodeBlockLanguagePicker = ({
     languagePickerOptions: languagePickerOptions,
     recentLanguageValues: recentLanguageValues,
     onMenuOpen: refreshRecentLanguages,
-    onSelection: handleSelection
+    onSelection: handleSelection,
+    triggerSpacing: triggerSpacing
   });
 };