@atlaskit/editor-plugin-code-block-advanced 6.2.0 → 6.2.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 6.2.2
+
+### Patch Changes
+
+- [`b4284749422b0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b4284749422b0) -
+  [ux] Fix the code block gutter alignment issue when toggling content mode
+- Updated dependencies
+
+## 6.2.1
+
+### Patch Changes
+
+- [`2a658b46713fb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2a658b46713fb) -
+  upgrade use of browser util
+- Updated dependencies
+
 ## 6.2.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/codeBlockAdvanced.js

@@ -19,6 +19,7 @@ var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 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 _syntaxHighlightingTheme = require("../ui/syntaxHighlightingTheme");
 var _theme = require("../ui/theme");
@@ -31,8 +32,13 @@ var _manageSelectionMarker = require("./extensions/manageSelectionMarker");
 var _prosemirrorDecorations = require("./extensions/prosemirrorDecorations");
 var _tripleClickExtension = require("./extensions/tripleClickExtension");
 var _loader = require("./languages/loader");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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) { (0, _defineProperty2.default)(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; }
+// Store last observed heights of code blocks
+var codeBlockHeights = new WeakMap();
 // Based on: https://prosemirror.net/examples/codemirror/
 var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
   function CodeBlockAdvancedNodeView(node, view, getPos, innerDecorations, config) {
@@ -127,6 +133,40 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     this.dom = this.cm.dom;
     this.dom.appendChild(spaceContainer);
 
+    // Observe size changes of the CodeMirror DOM and request a measurement pass
+    if ((0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) {
+      this.ro = new ResizeObserver(function (entries) {
+        // Skip measurements when:
+        // 1. Currently updating (prevents feedback loops)
+        // 2. CodeMirror has focus (user is actively typing/editing)
+        if (_this.updating || _this.cm.hasFocus) {
+          return;
+        }
+
+        // Only trigger on height changes, not width or other dimension changes
+        var _iterator = _createForOfIteratorHelper(entries),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var entry = _step.value;
+            var currentHeight = entry.contentRect.height;
+            var lastHeight = codeBlockHeights.get(_this.cm.contentDOM);
+            if (lastHeight !== undefined && lastHeight === currentHeight) {
+              return;
+            }
+            codeBlockHeights.set(_this.cm.contentDOM, currentHeight);
+          }
+          // CodeMirror to re-measure when its content size changes
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        _this.cm.requestMeasure();
+      });
+      this.ro.observe(this.cm.contentDOM);
+    }
+
     // This flag is used to avoid an update loop between the outer and
     // inner editor
     this.updating = false;
@@ -148,6 +188,10 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
       // codemirror
       this.clearProseMirrorDecorations();
       (_this$cleanupDisabled = this.cleanupDisabledState) === null || _this$cleanupDisabled === void 0 || _this$cleanupDisabled.call(this);
+      if ((0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) {
+        var _this$ro;
+        (_this$ro = this.ro) === null || _this$ro === void 0 || _this$ro.disconnect();
+      }
     }
   }, {
     key: "forwardUpdate",

package/dist/cjs/nodeviews/extensions/keymap/index.js

@@ -37,6 +37,7 @@ var codeBlockKeymap = function codeBlockKeymap(_ref2) {
     selectCodeBlockNode = _ref2.selectCodeBlockNode,
     onMaybeNodeSelection = _ref2.onMaybeNodeSelection,
     customFindReplace = _ref2.customFindReplace;
+  var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
   return [{
     key: 'ArrowUp',
     run: function run(cm) {
@@ -119,8 +120,8 @@ var codeBlockKeymap = function codeBlockKeymap(_ref2) {
         view.dispatchEvent(new KeyboardEvent('keydown', {
           key: 'f',
           code: 'KeyF',
-          metaKey: _browser.browser.mac ? true : false,
-          ctrlKey: _browser.browser.mac ? false : true
+          metaKey: browser.mac ? true : false,
+          ctrlKey: browser.mac ? false : true
         }));
         return true;
       }
@@ -172,8 +173,8 @@ var codeBlockKeymap = function codeBlockKeymap(_ref2) {
         view.dispatchEvent(new KeyboardEvent('keydown', {
           key: ']',
           code: 'BracketRight',
-          metaKey: _browser.browser.mac ? true : false,
-          ctrlKey: _browser.browser.mac ? false : true,
+          metaKey: browser.mac ? true : false,
+          ctrlKey: browser.mac ? false : true,
           altKey: true
         }));
         return true;
@@ -189,8 +190,8 @@ var codeBlockKeymap = function codeBlockKeymap(_ref2) {
         view.dispatchEvent(new KeyboardEvent('keydown', {
           key: ']',
           code: 'BracketLeft',
-          metaKey: _browser.browser.mac ? true : false,
-          ctrlKey: _browser.browser.mac ? false : true,
+          metaKey: browser.mac ? true : false,
+          ctrlKey: browser.mac ? false : true,
           altKey: true
         }));
         return true;

package/dist/cjs/ui/theme.js

@@ -1,22 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.codeFoldingTheme = exports.cmTheme = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@codemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-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) { (0, _defineProperty2.default)(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; }
 var getLineHeight = function getLineHeight() {
   return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
 };
-var getMaxGutterHeight = function getMaxGutterHeight() {
-  return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '1.5em' : undefined;
-};
 var getFontSize = function getFontSize() {
   return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
 };
@@ -83,12 +76,10 @@ var cmTheme = exports.cmTheme = _view.EditorView.theme({
   // codemirror is calculating (which happens after an animation frame).
   // Example problem: https://github.com/codemirror/dev/issues/1076
   // Ignore the first gutter element as it is a special hidden element.
-  '.cm-gutterElement:not(:first-child)': _objectSpread({
+  '.cm-gutterElement:not(:first-child)': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     minHeight: getLineHeight()
-  }, getMaxGutterHeight() && {
-    maxHeight: getMaxGutterHeight()
-  })
+  }
 });
 var codeFoldingTheme = exports.codeFoldingTheme = _view.EditorView.theme({
   '.cm-gutter': {

package/dist/es2019/nodeviews/codeBlockAdvanced.js

@@ -9,9 +9,13 @@ import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 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 { highlightStyle } from '../ui/syntaxHighlightingTheme';
 import { cmTheme, codeFoldingTheme } from '../ui/theme';
+
+// Store last observed heights of code blocks
+const codeBlockHeights = new WeakMap();
 import { syncCMWithPM } from './codemirrorSync/syncCMWithPM';
 import { getCMSelectionChanges } from './codemirrorSync/updateCMSelection';
 import { firstCodeBlockInDocument } from './extensions/firstCodeBlockInDocument';
@@ -103,6 +107,31 @@ class CodeBlockAdvancedNodeView {
     this.dom = this.cm.dom;
     this.dom.appendChild(spaceContainer);
 
+    // Observe size changes of the CodeMirror DOM and request a measurement pass
+    if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) {
+      this.ro = new ResizeObserver(entries => {
+        // Skip measurements when:
+        // 1. Currently updating (prevents feedback loops)
+        // 2. CodeMirror has focus (user is actively typing/editing)
+        if (this.updating || this.cm.hasFocus) {
+          return;
+        }
+
+        // Only trigger on height changes, not width or other dimension changes
+        for (const entry of entries) {
+          const currentHeight = entry.contentRect.height;
+          const lastHeight = codeBlockHeights.get(this.cm.contentDOM);
+          if (lastHeight !== undefined && lastHeight === currentHeight) {
+            return;
+          }
+          codeBlockHeights.set(this.cm.contentDOM, currentHeight);
+        }
+        // CodeMirror to re-measure when its content size changes
+        this.cm.requestMeasure();
+      });
+      this.ro.observe(this.cm.contentDOM);
+    }
+
     // This flag is used to avoid an update loop between the outer and
     // inner editor
     this.updating = false;
@@ -122,6 +151,10 @@ class CodeBlockAdvancedNodeView {
     // codemirror
     this.clearProseMirrorDecorations();
     (_this$cleanupDisabled = this.cleanupDisabledState) === null || _this$cleanupDisabled === void 0 ? void 0 : _this$cleanupDisabled.call(this);
+    if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) {
+      var _this$ro;
+      (_this$ro = this.ro) === null || _this$ro === void 0 ? void 0 : _this$ro.disconnect();
+    }
   }
   forwardUpdate(update) {
     var _this$getPos, _this$getPos2;

package/dist/es2019/nodeviews/extensions/keymap/index.js

@@ -1,6 +1,6 @@
 import { defaultKeymap, indentWithTab } from '@codemirror/commands';
 import { keymap as cmKeymap } from '@codemirror/view';
-import { browser } from '@atlaskit/editor-common/browser';
+import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { exitCode, selectAll } from '@atlaskit/editor-prosemirror/commands';
 import { undo, redo } from '@atlaskit/prosemirror-history';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -31,6 +31,7 @@ const codeBlockKeymap = ({
   onMaybeNodeSelection,
   customFindReplace
 }) => {
+  const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
   return [{
     key: 'ArrowUp',
     run: cm => maybeEscapeKeymap({

package/dist/es2019/ui/theme.js

@@ -2,7 +2,6 @@ import { EditorView as CodeMirror } from '@codemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const getLineHeight = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
-const getMaxGutterHeight = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : undefined;
 const getFontSize = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
 export const cmTheme = CodeMirror.theme({
   '&': {
@@ -69,10 +68,7 @@ export const cmTheme = CodeMirror.theme({
   // Ignore the first gutter element as it is a special hidden element.
   '.cm-gutterElement:not(:first-child)': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-    minHeight: getLineHeight(),
-    ...(getMaxGutterHeight() && {
-      maxHeight: getMaxGutterHeight()
-    })
+    minHeight: getLineHeight()
   }
 });
 export const codeFoldingTheme = CodeMirror.theme({

package/dist/esm/nodeviews/codeBlockAdvanced.js

@@ -2,6 +2,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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 { closeBrackets } from '@codemirror/autocomplete';
@@ -14,9 +17,13 @@ import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 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 { highlightStyle } from '../ui/syntaxHighlightingTheme';
 import { cmTheme, codeFoldingTheme } from '../ui/theme';
+
+// Store last observed heights of code blocks
+var codeBlockHeights = new WeakMap();
 import { syncCMWithPM } from './codemirrorSync/syncCMWithPM';
 import { getCMSelectionChanges } from './codemirrorSync/updateCMSelection';
 import { firstCodeBlockInDocument } from './extensions/firstCodeBlockInDocument';
@@ -120,6 +127,40 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     this.dom = this.cm.dom;
     this.dom.appendChild(spaceContainer);
 
+    // Observe size changes of the CodeMirror DOM and request a measurement pass
+    if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) {
+      this.ro = new ResizeObserver(function (entries) {
+        // Skip measurements when:
+        // 1. Currently updating (prevents feedback loops)
+        // 2. CodeMirror has focus (user is actively typing/editing)
+        if (_this.updating || _this.cm.hasFocus) {
+          return;
+        }
+
+        // Only trigger on height changes, not width or other dimension changes
+        var _iterator = _createForOfIteratorHelper(entries),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var entry = _step.value;
+            var currentHeight = entry.contentRect.height;
+            var lastHeight = codeBlockHeights.get(_this.cm.contentDOM);
+            if (lastHeight !== undefined && lastHeight === currentHeight) {
+              return;
+            }
+            codeBlockHeights.set(_this.cm.contentDOM, currentHeight);
+          }
+          // CodeMirror to re-measure when its content size changes
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        _this.cm.requestMeasure();
+      });
+      this.ro.observe(this.cm.contentDOM);
+    }
+
     // This flag is used to avoid an update loop between the outer and
     // inner editor
     this.updating = false;
@@ -141,6 +182,10 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
       // codemirror
       this.clearProseMirrorDecorations();
       (_this$cleanupDisabled = this.cleanupDisabledState) === null || _this$cleanupDisabled === void 0 || _this$cleanupDisabled.call(this);
+      if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) {
+        var _this$ro;
+        (_this$ro = this.ro) === null || _this$ro === void 0 || _this$ro.disconnect();
+      }
     }
   }, {
     key: "forwardUpdate",

package/dist/esm/nodeviews/extensions/keymap/index.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { defaultKeymap, indentWithTab } from '@codemirror/commands';
 import { keymap as cmKeymap } from '@codemirror/view';
-import { browser } from '@atlaskit/editor-common/browser';
+import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { exitCode, selectAll } from '@atlaskit/editor-prosemirror/commands';
 import { undo, redo } from '@atlaskit/prosemirror-history';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -30,6 +30,7 @@ var codeBlockKeymap = function codeBlockKeymap(_ref2) {
     selectCodeBlockNode = _ref2.selectCodeBlockNode,
     onMaybeNodeSelection = _ref2.onMaybeNodeSelection,
     customFindReplace = _ref2.customFindReplace;
+  var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
   return [{
     key: 'ArrowUp',
     run: function run(cm) {

package/dist/esm/ui/theme.js

@@ -1,15 +1,9 @@
-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 { EditorView as CodeMirror } from '@codemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var getLineHeight = function getLineHeight() {
   return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
 };
-var getMaxGutterHeight = function getMaxGutterHeight() {
-  return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : undefined;
-};
 var getFontSize = function getFontSize() {
   return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
 };
@@ -76,12 +70,10 @@ export var cmTheme = CodeMirror.theme({
   // codemirror is calculating (which happens after an animation frame).
   // Example problem: https://github.com/codemirror/dev/issues/1076
   // Ignore the first gutter element as it is a special hidden element.
-  '.cm-gutterElement:not(:first-child)': _objectSpread({
+  '.cm-gutterElement:not(:first-child)': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     minHeight: getLineHeight()
-  }, getMaxGutterHeight() && {
-    maxHeight: getMaxGutterHeight()
-  })
+  }
 });
 export var codeFoldingTheme = CodeMirror.theme({
   '.cm-gutter': {

package/dist/types/nodeviews/codeBlockAdvanced.d.ts

@@ -27,6 +27,7 @@ declare class CodeBlockAdvancedNodeView implements NodeView {
     private cleanupDisabledState;
     private languageLoader;
     private pmFacet;
+    private ro?;
     constructor(node: PMNode, view: EditorView, getPos: getPosHandlerNode, innerDecorations: DecorationSource, config: ConfigProps);
     destroy(): void;
     forwardUpdate(update: ViewUpdate): void;

package/dist/types-ts4.5/nodeviews/codeBlockAdvanced.d.ts

@@ -27,6 +27,7 @@ declare class CodeBlockAdvancedNodeView implements NodeView {
     private cleanupDisabledState;
     private languageLoader;
     private pmFacet;
+    private ro?;
     constructor(node: PMNode, view: EditorView, getPos: getPosHandlerNode, innerDecorations: DecorationSource, config: ConfigProps);
     destroy(): void;
     forwardUpdate(update: ViewUpdate): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "6.2.0",
+	"version": "6.2.2",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,7 +29,7 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^51.3.0",
-		"@atlaskit/editor-plugin-block-menu": "^4.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^5.0.0",
 		"@atlaskit/editor-plugin-code-block": "^8.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
 		"@atlaskit/editor-plugin-find-replace": "^6.0.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.13.0",
+		"@atlaskit/tmp-editor-statsig": "^13.16.0",
 		"@atlaskit/tokens": "^7.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
@@ -57,7 +57,7 @@
 		"codemirror-lang-elixir": "4.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.14.0",
+		"@atlaskit/editor-common": "^110.15.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},

package/src/nodeviews/codeBlockAdvanced.ts

@@ -30,12 +30,16 @@ import type {
 } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 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 type { CodeBlockAdvancedPlugin } from '../codeBlockAdvancedPluginType';
 import { highlightStyle } from '../ui/syntaxHighlightingTheme';
 import { cmTheme, codeFoldingTheme } from '../ui/theme';
 
+// Store last observed heights of code blocks
+const codeBlockHeights = new WeakMap<HTMLElement, number>();
+
 import { syncCMWithPM } from './codemirrorSync/syncCMWithPM';
 import { getCMSelectionChanges } from './codemirrorSync/updateCMSelection';
 import { firstCodeBlockInDocument } from './extensions/firstCodeBlockInDocument';
@@ -70,6 +74,7 @@ class CodeBlockAdvancedNodeView implements NodeView {
 	private cleanupDisabledState: (() => void) | undefined;
 	private languageLoader: LanguageLoader;
 	private pmFacet = Facet.define<DecorationSource>();
+	private ro?: ResizeObserver;
 
 	constructor(
 		node: PMNode,
@@ -167,6 +172,34 @@ class CodeBlockAdvancedNodeView implements NodeView {
 		this.dom = this.cm.dom;
 		this.dom.appendChild(spaceContainer);
 
+		// Observe size changes of the CodeMirror DOM and request a measurement pass
+		if (
+			expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
+			fg('platform_editor_content_mode_button_mvp')
+		) {
+			this.ro = new ResizeObserver((entries) => {
+				// Skip measurements when:
+				// 1. Currently updating (prevents feedback loops)
+				// 2. CodeMirror has focus (user is actively typing/editing)
+				if (this.updating || this.cm.hasFocus) {
+					return;
+				}
+
+				// Only trigger on height changes, not width or other dimension changes
+				for (const entry of entries) {
+					const currentHeight = entry.contentRect.height;
+					const lastHeight = codeBlockHeights.get(this.cm.contentDOM);
+					if (lastHeight !== undefined && lastHeight === currentHeight) {
+						return;
+					}
+					codeBlockHeights.set(this.cm.contentDOM, currentHeight);
+				}
+				// CodeMirror to re-measure when its content size changes
+				this.cm.requestMeasure();
+			});
+			this.ro.observe(this.cm.contentDOM);
+		}
+
 		// This flag is used to avoid an update loop between the outer and
 		// inner editor
 		this.updating = false;
@@ -186,6 +219,12 @@ class CodeBlockAdvancedNodeView implements NodeView {
 		// codemirror
 		this.clearProseMirrorDecorations();
 		this.cleanupDisabledState?.();
+		if (
+			expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
+			fg('platform_editor_content_mode_button_mvp')
+		) {
+			this.ro?.disconnect();
+		}
 	}
 
 	forwardUpdate(update: ViewUpdate) {

package/src/nodeviews/extensions/keymap/index.ts

@@ -2,7 +2,7 @@ import { defaultKeymap, indentWithTab } from '@codemirror/commands';
 import { type Extension } from '@codemirror/state';
 import { type KeyBinding, keymap as cmKeymap } from '@codemirror/view';
 
-import { browser } from '@atlaskit/editor-common/browser';
+import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { type RelativeSelectionPos } from '@atlaskit/editor-common/selection';
 import type { getPosHandlerNode } from '@atlaskit/editor-common/types';
 import { exitCode, selectAll } from '@atlaskit/editor-prosemirror/commands';
@@ -51,6 +51,9 @@ const codeBlockKeymap = ({
 	onMaybeNodeSelection,
 	customFindReplace,
 }: KeymapProps): readonly KeyBinding[] => {
+	const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true)
+		? getBrowserInfo()
+		: browserLegacy;
 	return [
 		{
 			key: 'ArrowUp',

package/src/ui/theme.ts

@@ -10,12 +10,6 @@ const getLineHeight = () =>
 		? '1.5em'
 		: '1.5rem';
 
-const getMaxGutterHeight = () =>
-	expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
-	fg('platform_editor_content_mode_button_mvp')
-		? '1.5em'
-		: undefined;
-
 const getFontSize = () =>
 	expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
 	fg('platform_editor_content_mode_button_mvp')
@@ -88,7 +82,6 @@ export const cmTheme = CodeMirror.theme({
 	'.cm-gutterElement:not(:first-child)': {
 		// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
 		minHeight: getLineHeight(),
-		...(getMaxGutterHeight() && { maxHeight: getMaxGutterHeight() }),
 	},
 });