@atlaskit/editor-plugin-type-ahead 22.1.0 → 22.1.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 22.1.1
+
+### Patch Changes
+
+- [`7306003a7565b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7306003a7565b) -
+  Fix modal dismissal, category spacing, measured list height, and viewport-aware menu placement
+  under platform_editor_slash_command.
+- Updated dependencies
+
 ## 22.1.0
 
 ### Minor Changes

package/dist/cjs/ui/ListRow.js

@@ -24,6 +24,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 var ListRow = exports.ListRow = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var children = _ref.children,
     measure = _ref.measure,
+    onMeasured = _ref.onMeasured,
     index = _ref.index,
     style = _ref.style,
     isVisible = _ref.isVisible,
@@ -36,13 +37,14 @@ var ListRow = exports.ListRow = /*#__PURE__*/(0, _react.forwardRef)(function (_r
       return;
     }
     var observer = new ResizeObserver(function () {
-      return measure();
+      measure();
+      onMeasured === null || onMeasured === void 0 || onMeasured();
     });
     observer.observe(childElementRef.current);
     return function () {
       return observer.disconnect();
     };
-  }, [isScrolling, isVisible, measure]);
+  }, [isScrolling, isVisible, measure, onMeasured]);
   return (
     /*#__PURE__*/
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop

package/dist/cjs/ui/registered-menu/RegisteredTypeAheadMenu.compiled.css

@@ -1,7 +1,8 @@
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko1mok{border-radius:var(--ds-radius-large,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._18m915vq{overflow-y:hidden}
 ._1bsbnklw{width:20pc}
+._1q51u2gc{padding-block-start:var(--ds-space-100,8px)}
 ._1reo15vq{overflow-x:hidden}
+._85i512x7{padding-block-end:var(--ds-space-075,6px)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._vchhusvi{box-sizing:border-box}

package/dist/cjs/ui/registered-menu/RegisteredTypeAheadMenu.js

@@ -14,6 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _registeredMenuModel = require("@atlaskit/editor-common/quick-insert/registered-menu-model");
+var _useMenuPopupSizing = require("@atlaskit/editor-common/quick-insert/use-menu-popup-sizing");
 var _typeAheadIsSectionOverflowItemKey = require("@atlaskit/editor-common/type-ahead-is-section-overflow-item-key");
 var _typeAheadSurfaceContext = require("@atlaskit/editor-common/type-ahead-surface-context");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -28,10 +29,10 @@ var _TypeAheadMenuRenderer = require("./TypeAheadMenuRenderer");
 var _TypeAheadProvider = require("./TypeAheadProvider");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var styles = {
-  menu: "_2rko12b0 _1reo15vq _18m915vq _1rjc1b66 _bfhk1bhr _vchhusvi _16qs130s _1bsbnklw"
+  menu: "_2rko1mok _1reo15vq _18m915vq _bfhk1bhr _vchhusvi _16qs130s _1q51u2gc _85i512x7 _1bsbnklw"
 };
 var DEFAULT_MENU_MAX_HEIGHT = 480;
-var MENU_VERTICAL_PADDING = 8;
+var MENU_VERTICAL_PADDING = 14;
 var MENU_WIDTH = 320;
 var POPUP_OFFSET = [0, 8];
 var EMPTY_COMPONENTS = [];
@@ -57,6 +58,13 @@ var RegisteredTypeAheadMenu = exports.RegisteredTypeAheadMenu = function Registe
     setQuery = _ref.setQuery,
     surface = _ref.surface,
     triggerHandler = _ref.triggerHandler;
+  var menuHeight = (0, _useMenuPopupSizing.useMenuPopupSizing)({
+    target: anchorElement,
+    boundariesElement: popupsBoundariesElement,
+    scrollableElement: popupsScrollableElement,
+    maxHeight: maxHeight,
+    offset: POPUP_OFFSET[1]
+  });
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var generatedId = (0, _react.useId)();
@@ -172,7 +180,7 @@ var RegisteredTypeAheadMenu = exports.RegisteredTypeAheadMenu = function Registe
   }), /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     ariaLabel: null,
     boundariesElement: popupsBoundariesElement,
-    fitHeight: maxHeight,
+    fitHeight: menuHeight,
     fitWidth: MENU_WIDTH,
     mountTo: popupsMountPoint,
     offset: POPUP_OFFSET,
@@ -191,7 +199,7 @@ var RegisteredTypeAheadMenu = exports.RegisteredTypeAheadMenu = function Registe
     Item: surface.Item,
     listLabel: surface.listLabel,
     listId: listId,
-    maxHeight: Math.max(0, maxHeight - MENU_VERTICAL_PADDING),
+    maxHeight: Math.max(0, menuHeight - MENU_VERTICAL_PADDING),
     model: menuModel,
     onItemHover: setSelectedItemIndex,
     selectedItemIndex: selectedItemIndex

package/dist/cjs/ui/registered-menu/TypeAheadMenuRenderer.js

@@ -12,6 +12,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _CellMeasurer = require("react-virtualized/dist/commonjs/CellMeasurer");
 var _List = require("react-virtualized/dist/commonjs/List");
+var _useMenuListHeight2 = require("@atlaskit/editor-common/quick-insert/use-menu-list-height");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _createTypeAheadRowRenderer = require("./createTypeAheadRowRenderer");
@@ -24,7 +25,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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; }
 var LIST_WIDTH = 320;
 var ESTIMATED_ROW_HEIGHT = 56;
-var MENU_FOOTER_HEIGHT = 48;
+// 40px item + 8px block padding + 1px separator.
+var MENU_FOOTER_HEIGHT = 49;
 var TypeAheadMenuRenderer = exports.TypeAheadMenuRenderer = function TypeAheadMenuRenderer(_ref) {
   var _model$root$component;
   var Item = _ref.Item,
@@ -82,6 +84,9 @@ var TypeAheadMenuRenderer = exports.TypeAheadMenuRenderer = function TypeAheadMe
       return "".concat(type, ":").concat(key);
     }).join('\0');
   }, [rows]);
+  var _useMenuListHeight = (0, _useMenuListHeight2.useMenuListHeight)(cache, rows.length, rowKeySignature),
+    measuredHeight = _useMenuListHeight.height,
+    updateHeight = _useMenuListHeight.updateHeight;
   (0, _react.useLayoutEffect)(function () {
     var _listRef$current, _listRef$current2;
     cache.clearAll();
@@ -96,6 +101,7 @@ var TypeAheadMenuRenderer = exports.TypeAheadMenuRenderer = function TypeAheadMe
   }, [selectedRowIndex]);
   var renderRow = (0, _createTypeAheadRowRenderer.createTypeAheadRowRenderer)({
     cache: cache,
+    onMeasured: updateHeight,
     itemIndexByRowIndex: itemIndexByRowIndex,
     Item: Item,
     listId: listId,
@@ -119,7 +125,8 @@ var TypeAheadMenuRenderer = exports.TypeAheadMenuRenderer = function TypeAheadMe
     role: hasListboxContent ? 'listbox' : undefined
   }, rows.length > 0 ? /*#__PURE__*/_react.default.createElement(_List.List, {
     containerRole: "presentation",
-    height: Math.min(rows.length * ESTIMATED_ROW_HEIGHT, listMaxHeight),
+    height: Math.min(measuredHeight, listMaxHeight),
+    onRowsRendered: updateHeight,
     overscanRowCount: 3,
     ref: listRef,
     role: "presentation",

package/dist/cjs/ui/registered-menu/createTypeAheadRowRenderer.js

@@ -13,6 +13,7 @@ var _TypeAheadSectionRow = require("./TypeAheadSectionRow");
 var noOp = function noOp() {};
 var createTypeAheadRowRenderer = exports.createTypeAheadRowRenderer = function createTypeAheadRowRenderer(_ref) {
   var cache = _ref.cache,
+    onMeasured = _ref.onMeasured,
     itemIndexByRowIndex = _ref.itemIndexByRowIndex,
     Item = _ref.Item,
     listId = _ref.listId,
@@ -44,6 +45,7 @@ var createTypeAheadRowRenderer = exports.createTypeAheadRowRenderer = function c
         isScrolling: isScrolling,
         isVisible: isVisible,
         measure: measure,
+        onMeasured: onMeasured,
         onMouseMove: noOp,
         style: style
       }, registration.type === 'menu-section' ? /*#__PURE__*/_react.default.createElement(_TypeAheadSectionRow.TypeAheadSectionRow, {

package/dist/es2019/ui/ListRow.js

@@ -16,6 +16,7 @@ import React, { useEffect, useRef, forwardRef } from 'react';
 export const ListRow = /*#__PURE__*/forwardRef(({
   children,
   measure,
+  onMeasured,
   index,
   style,
   isVisible,
@@ -28,10 +29,13 @@ export const ListRow = /*#__PURE__*/forwardRef(({
     if (!childElementRef.current || !isVisible || isScrolling) {
       return;
     }
-    const observer = new ResizeObserver(() => measure());
+    const observer = new ResizeObserver(() => {
+      measure();
+      onMeasured === null || onMeasured === void 0 ? void 0 : onMeasured();
+    });
     observer.observe(childElementRef.current);
     return () => observer.disconnect();
-  }, [isScrolling, isVisible, measure]);
+  }, [isScrolling, isVisible, measure, onMeasured]);
   return (
     /*#__PURE__*/
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop

package/dist/es2019/ui/registered-menu/RegisteredTypeAheadMenu.compiled.css

@@ -1,7 +1,8 @@
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko1mok{border-radius:var(--ds-radius-large,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._18m915vq{overflow-y:hidden}
 ._1bsbnklw{width:20pc}
+._1q51u2gc{padding-block-start:var(--ds-space-100,8px)}
 ._1reo15vq{overflow-x:hidden}
+._85i512x7{padding-block-end:var(--ds-space-075,6px)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._vchhusvi{box-sizing:border-box}

package/dist/es2019/ui/registered-menu/RegisteredTypeAheadMenu.js

@@ -4,6 +4,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { useIntl } from 'react-intl';
 import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 import { TYPE_AHEAD_SURFACE_CONTEXT } from '@atlaskit/editor-common/type-ahead-surface-context';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -17,10 +18,10 @@ import { getTypeAheadItemId } from './getTypeAheadItemId';
 import { TypeAheadMenuRenderer } from './TypeAheadMenuRenderer';
 import { TypeAheadProvider } from './TypeAheadProvider';
 const styles = {
-  menu: "_2rko12b0 _1reo15vq _18m915vq _1rjc1b66 _bfhk1bhr _vchhusvi _16qs130s _1bsbnklw"
+  menu: "_2rko1mok _1reo15vq _18m915vq _bfhk1bhr _vchhusvi _16qs130s _1q51u2gc _85i512x7 _1bsbnklw"
 };
 const DEFAULT_MENU_MAX_HEIGHT = 480;
-const MENU_VERTICAL_PADDING = 8;
+const MENU_VERTICAL_PADDING = 14;
 const MENU_WIDTH = 320;
 const POPUP_OFFSET = [0, 8];
 const EMPTY_COMPONENTS = [];
@@ -44,6 +45,13 @@ export const RegisteredTypeAheadMenu = ({
   triggerHandler
 }) => {
   var _api$uiControlRegistr2, _api$uiControlRegistr3;
+  const menuHeight = useMenuPopupSizing({
+    target: anchorElement,
+    boundariesElement: popupsBoundariesElement,
+    scrollableElement: popupsScrollableElement,
+    maxHeight,
+    offset: POPUP_OFFSET[1]
+  });
   const {
     formatMessage
   } = useIntl();
@@ -140,7 +148,7 @@ export const RegisteredTypeAheadMenu = ({
   }), /*#__PURE__*/React.createElement(Popup, {
     ariaLabel: null,
     boundariesElement: popupsBoundariesElement,
-    fitHeight: maxHeight,
+    fitHeight: menuHeight,
     fitWidth: MENU_WIDTH,
     mountTo: popupsMountPoint,
     offset: POPUP_OFFSET,
@@ -159,7 +167,7 @@ export const RegisteredTypeAheadMenu = ({
     Item: surface.Item,
     listLabel: surface.listLabel,
     listId: listId,
-    maxHeight: Math.max(0, maxHeight - MENU_VERTICAL_PADDING),
+    maxHeight: Math.max(0, menuHeight - MENU_VERTICAL_PADDING),
     model: menuModel,
     onItemHover: setSelectedItemIndex,
     selectedItemIndex: selectedItemIndex

package/dist/es2019/ui/registered-menu/TypeAheadMenuRenderer.js

@@ -2,6 +2,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
+import { useMenuListHeight } from '@atlaskit/editor-common/quick-insert/use-menu-list-height';
 import { typeAheadListMessages } from '@atlaskit/editor-common/type-ahead';
 import { Box, Text } from '@atlaskit/primitives/compiled';
 import { createTypeAheadRowRenderer } from './createTypeAheadRowRenderer';
@@ -10,7 +11,8 @@ import { PassThrough } from './PassThrough';
 import { TypeAheadMenuFooter } from './TypeAheadMenuFooter';
 const LIST_WIDTH = 320;
 const ESTIMATED_ROW_HEIGHT = 56;
-const MENU_FOOTER_HEIGHT = 48;
+// 40px item + 8px block padding + 1px separator.
+const MENU_FOOTER_HEIGHT = 49;
 export const TypeAheadMenuRenderer = ({
   Item,
   listLabel,
@@ -53,6 +55,10 @@ export const TypeAheadMenuRenderer = ({
     key,
     type
   }) => `${type}:${key}`).join('\0'), [rows]);
+  const {
+    height: measuredHeight,
+    updateHeight
+  } = useMenuListHeight(cache, rows.length, rowKeySignature);
   useLayoutEffect(() => {
     var _listRef$current, _listRef$current2;
     cache.clearAll();
@@ -67,6 +73,7 @@ export const TypeAheadMenuRenderer = ({
   }, [selectedRowIndex]);
   const renderRow = createTypeAheadRowRenderer({
     cache,
+    onMeasured: updateHeight,
     itemIndexByRowIndex,
     Item,
     listId,
@@ -88,7 +95,8 @@ export const TypeAheadMenuRenderer = ({
     role: hasListboxContent ? 'listbox' : undefined
   }, rows.length > 0 ? /*#__PURE__*/React.createElement(List, {
     containerRole: "presentation",
-    height: Math.min(rows.length * ESTIMATED_ROW_HEIGHT, listMaxHeight),
+    height: Math.min(measuredHeight, listMaxHeight),
+    onRowsRendered: updateHeight,
     overscanRowCount: 3,
     ref: listRef,
     role: "presentation",

package/dist/es2019/ui/registered-menu/createTypeAheadRowRenderer.js

@@ -6,6 +6,7 @@ import { TypeAheadSectionRow } from './TypeAheadSectionRow';
 const noOp = () => {};
 export const createTypeAheadRowRenderer = ({
   cache,
+  onMeasured,
   itemIndexByRowIndex,
   Item,
   listId,
@@ -38,6 +39,7 @@ export const createTypeAheadRowRenderer = ({
     isScrolling: isScrolling,
     isVisible: isVisible,
     measure: measure,
+    onMeasured: onMeasured,
     onMouseMove: noOp,
     style: style
   }, registration.type === 'menu-section' ? /*#__PURE__*/React.createElement(TypeAheadSectionRow, {

package/dist/esm/ui/ListRow.js

@@ -16,6 +16,7 @@ import React, { useEffect, useRef, forwardRef } from 'react';
 export var ListRow = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var children = _ref.children,
     measure = _ref.measure,
+    onMeasured = _ref.onMeasured,
     index = _ref.index,
     style = _ref.style,
     isVisible = _ref.isVisible,
@@ -28,13 +29,14 @@ export var ListRow = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return;
     }
     var observer = new ResizeObserver(function () {
-      return measure();
+      measure();
+      onMeasured === null || onMeasured === void 0 || onMeasured();
     });
     observer.observe(childElementRef.current);
     return function () {
       return observer.disconnect();
     };
-  }, [isScrolling, isVisible, measure]);
+  }, [isScrolling, isVisible, measure, onMeasured]);
   return (
     /*#__PURE__*/
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop

package/dist/esm/ui/registered-menu/RegisteredTypeAheadMenu.compiled.css

@@ -1,7 +1,8 @@
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko1mok{border-radius:var(--ds-radius-large,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._18m915vq{overflow-y:hidden}
 ._1bsbnklw{width:20pc}
+._1q51u2gc{padding-block-start:var(--ds-space-100,8px)}
 ._1reo15vq{overflow-x:hidden}
+._85i512x7{padding-block-end:var(--ds-space-075,6px)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._vchhusvi{box-sizing:border-box}

package/dist/esm/ui/registered-menu/RegisteredTypeAheadMenu.js

@@ -6,6 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { useIntl } from 'react-intl';
 import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 import { TYPE_AHEAD_SURFACE_CONTEXT } from '@atlaskit/editor-common/type-ahead-surface-context';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -19,10 +20,10 @@ import { getTypeAheadItemId } from './getTypeAheadItemId';
 import { TypeAheadMenuRenderer } from './TypeAheadMenuRenderer';
 import { TypeAheadProvider } from './TypeAheadProvider';
 var styles = {
-  menu: "_2rko12b0 _1reo15vq _18m915vq _1rjc1b66 _bfhk1bhr _vchhusvi _16qs130s _1bsbnklw"
+  menu: "_2rko1mok _1reo15vq _18m915vq _bfhk1bhr _vchhusvi _16qs130s _1q51u2gc _85i512x7 _1bsbnklw"
 };
 var DEFAULT_MENU_MAX_HEIGHT = 480;
-var MENU_VERTICAL_PADDING = 8;
+var MENU_VERTICAL_PADDING = 14;
 var MENU_WIDTH = 320;
 var POPUP_OFFSET = [0, 8];
 var EMPTY_COMPONENTS = [];
@@ -48,6 +49,13 @@ export var RegisteredTypeAheadMenu = function RegisteredTypeAheadMenu(_ref) {
     setQuery = _ref.setQuery,
     surface = _ref.surface,
     triggerHandler = _ref.triggerHandler;
+  var menuHeight = useMenuPopupSizing({
+    target: anchorElement,
+    boundariesElement: popupsBoundariesElement,
+    scrollableElement: popupsScrollableElement,
+    maxHeight: maxHeight,
+    offset: POPUP_OFFSET[1]
+  });
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var generatedId = useId();
@@ -163,7 +171,7 @@ export var RegisteredTypeAheadMenu = function RegisteredTypeAheadMenu(_ref) {
   }), /*#__PURE__*/React.createElement(Popup, {
     ariaLabel: null,
     boundariesElement: popupsBoundariesElement,
-    fitHeight: maxHeight,
+    fitHeight: menuHeight,
     fitWidth: MENU_WIDTH,
     mountTo: popupsMountPoint,
     offset: POPUP_OFFSET,
@@ -182,7 +190,7 @@ export var RegisteredTypeAheadMenu = function RegisteredTypeAheadMenu(_ref) {
     Item: surface.Item,
     listLabel: surface.listLabel,
     listId: listId,
-    maxHeight: Math.max(0, maxHeight - MENU_VERTICAL_PADDING),
+    maxHeight: Math.max(0, menuHeight - MENU_VERTICAL_PADDING),
     model: menuModel,
     onItemHover: setSelectedItemIndex,
     selectedItemIndex: selectedItemIndex

package/dist/esm/ui/registered-menu/TypeAheadMenuRenderer.js

@@ -7,6 +7,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
+import { useMenuListHeight } from '@atlaskit/editor-common/quick-insert/use-menu-list-height';
 import { typeAheadListMessages } from '@atlaskit/editor-common/type-ahead';
 import { Box, Text } from '@atlaskit/primitives/compiled';
 import { createTypeAheadRowRenderer } from './createTypeAheadRowRenderer';
@@ -15,7 +16,8 @@ import { PassThrough } from './PassThrough';
 import { TypeAheadMenuFooter } from './TypeAheadMenuFooter';
 var LIST_WIDTH = 320;
 var ESTIMATED_ROW_HEIGHT = 56;
-var MENU_FOOTER_HEIGHT = 48;
+// 40px item + 8px block padding + 1px separator.
+var MENU_FOOTER_HEIGHT = 49;
 export var TypeAheadMenuRenderer = function TypeAheadMenuRenderer(_ref) {
   var _model$root$component;
   var Item = _ref.Item,
@@ -73,6 +75,9 @@ export var TypeAheadMenuRenderer = function TypeAheadMenuRenderer(_ref) {
       return "".concat(type, ":").concat(key);
     }).join('\0');
   }, [rows]);
+  var _useMenuListHeight = useMenuListHeight(cache, rows.length, rowKeySignature),
+    measuredHeight = _useMenuListHeight.height,
+    updateHeight = _useMenuListHeight.updateHeight;
   useLayoutEffect(function () {
     var _listRef$current, _listRef$current2;
     cache.clearAll();
@@ -87,6 +92,7 @@ export var TypeAheadMenuRenderer = function TypeAheadMenuRenderer(_ref) {
   }, [selectedRowIndex]);
   var renderRow = createTypeAheadRowRenderer({
     cache: cache,
+    onMeasured: updateHeight,
     itemIndexByRowIndex: itemIndexByRowIndex,
     Item: Item,
     listId: listId,
@@ -110,7 +116,8 @@ export var TypeAheadMenuRenderer = function TypeAheadMenuRenderer(_ref) {
     role: hasListboxContent ? 'listbox' : undefined
   }, rows.length > 0 ? /*#__PURE__*/React.createElement(List, {
     containerRole: "presentation",
-    height: Math.min(rows.length * ESTIMATED_ROW_HEIGHT, listMaxHeight),
+    height: Math.min(measuredHeight, listMaxHeight),
+    onRowsRendered: updateHeight,
     overscanRowCount: 3,
     ref: listRef,
     role: "presentation",

package/dist/esm/ui/registered-menu/createTypeAheadRowRenderer.js

@@ -6,6 +6,7 @@ import { TypeAheadSectionRow } from './TypeAheadSectionRow';
 var noOp = function noOp() {};
 export var createTypeAheadRowRenderer = function createTypeAheadRowRenderer(_ref) {
   var cache = _ref.cache,
+    onMeasured = _ref.onMeasured,
     itemIndexByRowIndex = _ref.itemIndexByRowIndex,
     Item = _ref.Item,
     listId = _ref.listId,
@@ -37,6 +38,7 @@ export var createTypeAheadRowRenderer = function createTypeAheadRowRenderer(_ref
         isScrolling: isScrolling,
         isVisible: isVisible,
         measure: measure,
+        onMeasured: onMeasured,
         onMouseMove: noOp,
         style: style
       }, registration.type === 'menu-section' ? /*#__PURE__*/React.createElement(TypeAheadSectionRow, {

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

@@ -17,5 +17,6 @@ import type { ListRowProps } from 'react-virtualized';
 export declare const ListRow: React.ForwardRefExoticComponent<{
     children: ReactNode;
     measure: () => void;
+    onMeasured?: () => void;
     onMouseMove: MouseEventHandler<HTMLDivElement>;
 } & Pick<ListRowProps, 'index' | 'isScrolling' | 'isVisible' | 'style'> & React.RefAttributes<HTMLDivElement>>;

package/dist/types/ui/registered-menu/createTypeAheadRowRenderer.d.ts

@@ -2,12 +2,13 @@ import type { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeas
 import type { ListRowRenderer } from 'react-virtualized/dist/commonjs/List';
 import type { RegisterMenuItem, RegisterMenuSection } from '@atlaskit/editor-ui-control-model/types';
 import type { TypeAheadItemComponent } from './typeAheadMenuTypes';
-export declare const createTypeAheadRowRenderer: ({ cache, itemIndexByRowIndex, Item, listId, onItemHover, rows, selectedItemIndex, }: {
+export declare const createTypeAheadRowRenderer: ({ cache, onMeasured, itemIndexByRowIndex, Item, listId, onItemHover, rows, selectedItemIndex, }: {
     cache: CellMeasurerCache;
     Item: TypeAheadItemComponent;
     itemIndexByRowIndex: Map<number, number>;
     listId: string;
     onItemHover: (itemIndex: number) => void;
+    onMeasured: () => void;
     rows: Array<RegisterMenuItem | RegisterMenuSection>;
     selectedItemIndex: number;
 }) => ListRowRenderer;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-type-ahead",
-	"version": "22.1.0",
+	"version": "22.1.1",
 	"description": "Type-ahead plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/prosemirror-history": "^1.2.0",
 		"@atlaskit/prosemirror-input-rules": "^4.1.0",
-		"@atlaskit/tmp-editor-statsig": "^208.0.0",
+		"@atlaskit/tmp-editor-statsig": "^209.0.0",
 		"@atlaskit/tokens": "^20.0.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -54,7 +54,7 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^125.2.0",
+		"@atlaskit/editor-common": "^125.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"