@atlaskit/link-picker 1.45.1 → 1.46.1

package/dist/es2019/ui/link-picker/search-results/search-results-container/index.js

@@ -1,13 +1,11 @@
-import _extends from "@babel/runtime/helpers/extends";
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { forwardRef } from 'react';
+import { useLayoutEffect, useRef } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { MinHeightContainer } from '../../../../common/ui/min-height-container';
 const flexColumn = css({
   display: 'flex',
@@ -15,17 +13,25 @@ const flexColumn = css({
   justifyContent: 'flex-start',
   width: '100%'
 });
-export const SearchResultsContainer = /*#__PURE__*/forwardRef(({
+export const SearchResultsContainer = ({
   hasTabs,
-  ...props
-}, ref) => {
-  const minHeight = hasTabs ? '347px' : '302px';
-  const ffMinHeight = fg('platform.linking-platform.link-picker.fixed-height-search-results') ? minHeight : 'auto';
-
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-  return jsx(MinHeightContainer, _extends({
+  adaptiveHeight,
+  isLoadingResults,
+  children
+}) => {
+  const ref = useRef(null);
+  const currentHeight = useRef(null);
+  const fixedMinHeight = hasTabs ? '347px' : '302px';
+  const adaptiveMinHeight = isLoadingResults && !!currentHeight.current ? `${currentHeight.current}px` : 'auto';
+  const minheight = adaptiveHeight ? adaptiveMinHeight : fixedMinHeight;
+  useLayoutEffect(() => {
+    if (ref.current && adaptiveHeight && !isLoadingResults) {
+      currentHeight.current = ref.current.getBoundingClientRect().height;
+    }
+  });
+  return jsx(MinHeightContainer, {
     ref: ref,
-    minHeight: ffMinHeight,
+    minHeight: minheight,
     css: flexColumn
-  }, props));
-});
+  }, children);
+};

package/dist/es2019/ui/loader-fallback/index.js

@@ -4,7 +4,6 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Spinner from '@atlaskit/spinner';
 import { MinHeightContainer } from '../../common/ui/min-height-container';
 const styles = css({
@@ -16,37 +15,31 @@ const LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITH_DISPLAYTEXT = '
 const LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITHOUT_DISPLAYTEXT = '429px';
 const LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_DISPLAYTEXT = '218px';
 const LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITHOUT_DISPLAYTEXT = '141px';
-// EDM-7122: can delete these two consts once min height container for link picker is firm for the loader
-const LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_DISPLAYTEXT = '142px';
-const LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_DISPLAYTEXT = '220px';
 const getEstimatedMinHeight = ({
   hideDisplayText,
   isLoadingPlugins,
   plugins,
   url
 }) => {
-  if (fg('platform.linking-platform.link-picker.fixed-height-search-results')) {
+  /**
+   * "Insert mode" (search results shown initially)
+   */
+  if (!url) {
     /**
-     * "Insert mode" (search results shown initially)
+     * With tabs
      */
-    if (!url) {
-      /**
-       * With tabs
-       */
-      if (plugins && plugins.length > 1 || isLoadingPlugins) {
-        return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITH_DISPLAYTEXT;
-      }
+    if (plugins && plugins.length > 1 || isLoadingPlugins) {
+      return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITH_DISPLAYTEXT;
+    }
 
-      /**
-       * Without tabs
-       */
-      if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) === 1) {
-        return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITH_DISPLAYTEXT;
-      }
+    /**
+     * Without tabs
+     */
+    if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) === 1) {
+      return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITH_DISPLAYTEXT;
     }
-    return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_DISPLAYTEXT;
   }
-  return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_DISPLAYTEXT;
+  return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_DISPLAYTEXT;
 };
 
 /**

package/dist/es2019/ui/main.js

@@ -3,13 +3,12 @@ import _extends from "@babel/runtime/helpers/extends";
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React, { Fragment, memo } from 'react';
+import React, { memo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { LazySuspense } from 'react-loosely-lazy';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { COMPONENT_NAME, LINK_PICKER_WIDTH_IN_PX } from '../common/constants';
 import { LinkPickerSessionProvider } from '../controllers/session-provider';
 import { ErrorBoundary } from './error-boundary';
@@ -20,7 +19,7 @@ export const testIds = {
 };
 export const PACKAGE_DATA = {
   packageName: "@atlaskit/link-picker" || '',
-  packageVersion: "1.45.1" || '',
+  packageVersion: "1.46.1" || '',
   componentName: COMPONENT_NAME,
   source: COMPONENT_NAME
 };
@@ -46,14 +45,6 @@ export const composeLinkPicker = Component => {
       component
     } = props;
     const RootComponent = component !== null && component !== void 0 ? component : DefaultRootComponent;
-
-    /**
-     * When ff enabled: root container will provide width to component + loader + error boundary
-     * When ff disabled: component + loader + error boundary each providing their own width
-     * Cannot make this change easier at risk of regression as external adopters may have css override on the form element
-     */
-    const RootFixedWidthContainer = fg('platform.linking-platform.link-picker.fixed-height-search-results') ? FixedWidthContainer : Fragment;
-    const LoaderFallbackContainer = fg('platform.linking-platform.link-picker.fixed-height-search-results') ? Fragment : FixedWidthContainer;
     return jsx(AnalyticsContext, {
       data: PACKAGE_DATA
     }, jsx(LinkPickerSessionProvider, null, jsx(MessagesProvider, null, jsx("div", {
@@ -66,13 +57,13 @@ export const composeLinkPicker = Component => {
         ['--link-picker-padding-top']: (_props$paddingTop = props.paddingTop) !== null && _props$paddingTop !== void 0 ? _props$paddingTop : "var(--ds-space-200, 16px)",
         ['--link-picker-padding-bottom']: (_props$paddingBottom = props.paddingBottom) !== null && _props$paddingBottom !== void 0 ? _props$paddingBottom : "var(--ds-space-200, 16px)"
       }
-    }, jsx(RootFixedWidthContainer, null, jsx(ErrorBoundary, null, jsx(LazySuspense, {
-      fallback: jsx(LoaderFallbackContainer, null, jsx(LoaderFallback, {
+    }, jsx(FixedWidthContainer, null, jsx(ErrorBoundary, null, jsx(LazySuspense, {
+      fallback: jsx(LoaderFallback, {
         url: props.url,
         hideDisplayText: props.hideDisplayText,
         isLoadingPlugins: props.isLoadingPlugins,
         plugins: props.plugins
-      }))
+      })
     }, jsx(RootComponent, _extends({}, props, {
       "data-testid": testIds.linkPickerRoot
     }), jsx(Component, props)))))))));

package/dist/esm/ui/error-boundary/error-boundary-fallback/index.js

@@ -5,13 +5,10 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { defineMessages, useIntl } from 'react-intl-next';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { LINK_PICKER_MIN_HEIGHT_IN_PX_FALLBACK } from '../../../common/constants';
 import { GenericErrorSVG } from '../../../common/generic-error-svg';
 import { EmptyState } from '../../../common/ui/empty-state';
 import { MinHeightContainer } from '../../../common/ui/min-height-container';
-// eslint-disable-next-line @atlassian/tangerine/import/no-parent-imports
-import { rootContainerStyles } from '../../link-picker/styled';
 var errorBoundaryFallbackStyles = css({
   lineHeight: 'initial'
 });
@@ -31,30 +28,15 @@ export var ErrorBoundaryFallback = function ErrorBoundaryFallback() {
   var intl = useIntl();
   var header = intl.formatMessage(messages.heading);
   var description = intl.formatMessage(messages.description);
-  if (fg('platform.linking-platform.link-picker.fixed-height-search-results')) {
-    return jsx(MinHeightContainer, {
-      css: errorBoundaryFallbackStyles,
-      minHeight: LINK_PICKER_MIN_HEIGHT_IN_PX_FALLBACK,
-      "data-testid": "link-picker-root-error-boundary-ui"
-    }, jsx(EmptyState, {
-      header: header,
-      renderImage: function renderImage() {
-        return jsx(GenericErrorSVG, null);
-      },
-      description: description
-    }));
-  }
-  return (
-    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    jsx("div", {
-      css: rootContainerStyles,
-      "data-testid": "link-picker-root-error-boundary-ui"
-    }, jsx(EmptyState, {
-      header: header,
-      renderImage: function renderImage() {
-        return jsx(GenericErrorSVG, null);
-      },
-      description: description
-    }))
-  );
+  return jsx(MinHeightContainer, {
+    css: errorBoundaryFallbackStyles,
+    minHeight: LINK_PICKER_MIN_HEIGHT_IN_PX_FALLBACK,
+    "data-testid": "link-picker-root-error-boundary-ui"
+  }, jsx(EmptyState, {
+    header: header,
+    renderImage: function renderImage() {
+      return jsx(GenericErrorSVG, null);
+    },
+    description: description
+  }));
 };

package/dist/esm/ui/link-picker/index.js

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Fragment, memo, useCallback, useLayoutEffect, useMemo, useReducer } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { jsx } from '@emotion/react';
+import { css, jsx } from '@emotion/react';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import uuid from 'uuid';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
@@ -30,10 +30,22 @@ import { FormFooter, testIds as formFooterTestIds } from './form-footer';
 import { LinkPickerSubmitButton } from './form-footer/link-picker-submit-button';
 import { formMessages, linkMessages, linkTextMessages, searchMessages } from './messages';
 import { SearchResults, testIds as searchTestIds } from './search-results';
-import { formFooterMargin, rootContainerStyles } from './styled';
 import { testIds as textFieldTestIds, TextInput } from './text-input';
 import { TrackMount } from './track-mount';
 import { getDataSource, getScreenReaderText } from './utils';
+var rootContainerStyles = css({
+  paddingLeft: 'var(--link-picker-padding-left)',
+  paddingRight: 'var(--link-picker-padding-right)',
+  paddingTop: 'var(--link-picker-padding-top)',
+  paddingBottom: 'var(--link-picker-padding-bottom)',
+  boxSizing: 'border-box',
+  lineHeight: 'initial',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  display: 'block !important'
+});
+var formFooterMargin = css({
+  marginTop: "var(--ds-space-200, 16px)"
+});
 export var testIds = _objectSpread(_objectSpread(_objectSpread({
   linkPickerRoot: 'link-picker-root',
   linkPicker: 'link-picker',
@@ -97,6 +109,8 @@ export var LinkPicker = withLinkPickerAnalyticsContext( /*#__PURE__*/memo(functi
     customMessages = _ref.customMessages,
     _ref$isSubmitting = _ref.isSubmitting,
     isSubmitting = _ref$isSubmitting === void 0 ? false : _ref$isSubmitting,
+    _ref$adaptiveHeight = _ref.adaptiveHeight,
+    adaptiveHeight = _ref$adaptiveHeight === void 0 ? false : _ref$adaptiveHeight,
     _ref$UNSAFE_moveSubmi = _ref.UNSAFE_moveSubmitButton,
     UNSAFE_moveSubmitButton = _ref$UNSAFE_moveSubmi === void 0 ? false : _ref$UNSAFE_moveSubmi;
   var _useAnalyticsEvents = useAnalyticsEvents(),
@@ -327,9 +341,7 @@ export var LinkPicker = withLinkPickerAnalyticsContext( /*#__PURE__*/memo(functi
   var screenReaderText = browser().safari && getScreenReaderText(items !== null && items !== void 0 ? items : [], selectedIndex, intl);
   var customSubmitButtonLabel = customMessages !== null && customMessages !== void 0 && customMessages.submitButtonLabel ? customMessages.submitButtonLabel : undefined;
   return jsx("form", {
-    "data-testid": testIds.linkPicker
-    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    ,
+    "data-testid": testIds.linkPicker,
     css: rootContainerStyles
     // Use onSubmitCapture instead of onSubmit so that any possible parent form isn't submitted
     ,
@@ -399,6 +411,7 @@ export var LinkPicker = withLinkPickerAnalyticsContext( /*#__PURE__*/memo(functi
     handleSelected: handleSelected,
     handleTabChange: handleTabChange,
     handleSearchListOnChange: handleSearchListOnChange,
+    adaptiveHeight: adaptiveHeight,
     retry: retry
   }), jsx(FormFooter, {
     error: error,

package/dist/esm/ui/link-picker/search-results/index.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 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; }
@@ -13,7 +12,6 @@ import { css, jsx } from '@emotion/react';
 import { Box, xcss } from '@atlaskit/primitives';
 import Spinner from '@atlaskit/spinner/spinner';
 import Tabs, { Tab, TabList } from '@atlaskit/tabs';
-import { useFixHeight } from '../../../controllers/use-fix-height';
 import { LinkSearchError, testIds as searchErrorTestIds } from './link-search-error';
 import { LinkSearchList, testIds as listTestIds } from './link-search-list';
 import { ScrollingTabList } from './scrolling-tabs';
@@ -54,20 +52,20 @@ export var SearchResults = function SearchResults(_ref) {
     selectedIndex = _ref.selectedIndex,
     handleSelected = _ref.handleSelected,
     handleKeyDown = _ref.handleKeyDown,
+    adaptiveHeight = _ref.adaptiveHeight,
     retry = _ref.retry;
   var isActivePlugin = !!activePlugin;
-
-  // This will be redundant if we move towards fixed height search results section
-  var fixListHeightProps = useFixHeight(isLoadingResults);
   var tabList = jsx(TabList, null, tabs.map(function (tab) {
     return jsx(Tab, {
       key: tab.tabTitle,
       testId: testIds.tabItem
     }, tab.tabTitle);
   }));
-  return jsx(SearchResultsContainer, _extends({
-    hasTabs: !!tabs.length || isLoadingPlugins
-  }, fixListHeightProps), isLoadingPlugins && !!queryState && jsx("div", {
+  return jsx(SearchResultsContainer, {
+    hasTabs: !!tabs.length || isLoadingPlugins,
+    adaptiveHeight: adaptiveHeight,
+    isLoadingResults: isLoadingResults
+  }, isLoadingPlugins && !!queryState && jsx("div", {
     css: spinnerContainerStyles
   }, jsx(Spinner, {
     testId: testIds.tabsLoadingIndicator,
@@ -94,6 +92,7 @@ export var SearchResults = function SearchResults(_ref) {
     onChange: handleSearchListOnChange,
     onKeyDown: handleKeyDown,
     hasSearchTerm: !!(queryState !== null && queryState !== void 0 && queryState.query.length),
-    activePlugin: activePlugin
+    activePlugin: activePlugin,
+    adaptiveHeight: adaptiveHeight
   }), error ? (_activePlugin$errorFa = activePlugin === null || activePlugin === void 0 || (_activePlugin$errorFa2 = activePlugin.errorFallback) === null || _activePlugin$errorFa2 === void 0 ? void 0 : _activePlugin$errorFa2.call(activePlugin, error, retry)) !== null && _activePlugin$errorFa !== void 0 ? _activePlugin$errorFa : jsx(LinkSearchError, null) : null));
 };

package/dist/esm/ui/link-picker/search-results/link-search-list/index.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["onChange", "onSelect", "onKeyDown", "items", "activeIndex", "selectedIndex", "isLoading", "ariaControls", "ariaLabelledBy", "ariaReadOnly", "role", "id", "hasSearchTerm", "activePlugin"];
+var _excluded = ["onChange", "onSelect", "onKeyDown", "items", "activeIndex", "selectedIndex", "isLoading", "ariaControls", "ariaLabelledBy", "ariaReadOnly", "role", "id", "hasSearchTerm", "activePlugin", "adaptiveHeight"];
 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; }
 /**
@@ -65,6 +65,7 @@ export var LinkSearchList = /*#__PURE__*/forwardRef(function (_ref, ref) {
     id = _ref.id,
     hasSearchTerm = _ref.hasSearchTerm,
     activePlugin = _ref.activePlugin,
+    adaptiveHeight = _ref.adaptiveHeight,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var itemsContent;
   var loadingContent;
@@ -136,7 +137,7 @@ export var LinkSearchList = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }))), jsx("ul", {
       id: id,
       role: role
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
       ,
       css: listStyles,
       "aria-controls": "fabric.smartcard.linkpicker.suggested.results",
@@ -166,8 +167,8 @@ export var LinkSearchList = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }
   if (isLoading) {
     loadingContent = jsx(MinHeightContainer, {
-      minHeight: fg('platform.linking-platform.link-picker.fixed-height-search-results') ? '50px' : '80px'
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      minHeight: adaptiveHeight ? '80px' : '50px'
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       ,
       css: spinnerContainerStyles
     }, jsx(Spinner, {

package/dist/esm/ui/link-picker/search-results/search-results-container/index.js

@@ -1,15 +1,11 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["hasTabs"];
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { forwardRef } from 'react';
+import { useLayoutEffect, useRef } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { MinHeightContainer } from '../../../../common/ui/min-height-container';
 var flexColumn = css({
   display: 'flex',
@@ -17,16 +13,24 @@ var flexColumn = css({
   justifyContent: 'flex-start',
   width: '100%'
 });
-export var SearchResultsContainer = /*#__PURE__*/forwardRef(function (_ref, ref) {
+export var SearchResultsContainer = function SearchResultsContainer(_ref) {
   var hasTabs = _ref.hasTabs,
-    props = _objectWithoutProperties(_ref, _excluded);
-  var minHeight = hasTabs ? '347px' : '302px';
-  var ffMinHeight = fg('platform.linking-platform.link-picker.fixed-height-search-results') ? minHeight : 'auto';
-
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-  return jsx(MinHeightContainer, _extends({
+    adaptiveHeight = _ref.adaptiveHeight,
+    isLoadingResults = _ref.isLoadingResults,
+    children = _ref.children;
+  var ref = useRef(null);
+  var currentHeight = useRef(null);
+  var fixedMinHeight = hasTabs ? '347px' : '302px';
+  var adaptiveMinHeight = isLoadingResults && !!currentHeight.current ? "".concat(currentHeight.current, "px") : 'auto';
+  var minheight = adaptiveHeight ? adaptiveMinHeight : fixedMinHeight;
+  useLayoutEffect(function () {
+    if (ref.current && adaptiveHeight && !isLoadingResults) {
+      currentHeight.current = ref.current.getBoundingClientRect().height;
+    }
+  });
+  return jsx(MinHeightContainer, {
     ref: ref,
-    minHeight: ffMinHeight,
+    minHeight: minheight,
     css: flexColumn
-  }, props));
-});
+  }, children);
+};

package/dist/esm/ui/loader-fallback/index.js

@@ -4,7 +4,6 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Spinner from '@atlaskit/spinner';
 import { MinHeightContainer } from '../../common/ui/min-height-container';
 var styles = css({
@@ -16,36 +15,30 @@ var LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITH_DISPLAYTEXT = '50
 var LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITHOUT_DISPLAYTEXT = '429px';
 var LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_DISPLAYTEXT = '218px';
 var LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITHOUT_DISPLAYTEXT = '141px';
-// EDM-7122: can delete these two consts once min height container for link picker is firm for the loader
-var LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_DISPLAYTEXT = '142px';
-var LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_DISPLAYTEXT = '220px';
 var getEstimatedMinHeight = function getEstimatedMinHeight(_ref) {
   var hideDisplayText = _ref.hideDisplayText,
     isLoadingPlugins = _ref.isLoadingPlugins,
     plugins = _ref.plugins,
     url = _ref.url;
-  if (fg('platform.linking-platform.link-picker.fixed-height-search-results')) {
+  /**
+   * "Insert mode" (search results shown initially)
+   */
+  if (!url) {
     /**
-     * "Insert mode" (search results shown initially)
+     * With tabs
      */
-    if (!url) {
-      /**
-       * With tabs
-       */
-      if (plugins && plugins.length > 1 || isLoadingPlugins) {
-        return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITH_DISPLAYTEXT;
-      }
+    if (plugins && plugins.length > 1 || isLoadingPlugins) {
+      return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_TABS_WITH_DISPLAYTEXT;
+    }
 
-      /**
-       * Without tabs
-       */
-      if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) === 1) {
-        return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITH_DISPLAYTEXT;
-      }
+    /**
+     * Without tabs
+     */
+    if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) === 1) {
+      return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_PLUGIN_WITH_DISPLAYTEXT;
     }
-    return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_DISPLAYTEXT;
   }
-  return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITH_DISPLAYTEXT;
+  return hideDisplayText ? LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITHOUT_DISPLAYTEXT : LINK_PICKER_MIN_HEIGHT_IN_PX_WITHOUT_TABS_WITH_DISPLAYTEXT;
 };
 
 /**

package/dist/esm/ui/main.js

@@ -4,13 +4,12 @@ import _extends from "@babel/runtime/helpers/extends";
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React, { Fragment, memo } from 'react';
+import React, { memo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { LazySuspense } from 'react-loosely-lazy';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { COMPONENT_NAME, LINK_PICKER_WIDTH_IN_PX } from '../common/constants';
 import { LinkPickerSessionProvider } from '../controllers/session-provider';
 import { ErrorBoundary } from './error-boundary';
@@ -21,7 +20,7 @@ export var testIds = {
 };
 export var PACKAGE_DATA = {
   packageName: "@atlaskit/link-picker" || '',
-  packageVersion: "1.45.1" || '',
+  packageVersion: "1.46.1" || '',
   componentName: COMPONENT_NAME,
   source: COMPONENT_NAME
 };
@@ -44,26 +43,18 @@ export var composeLinkPicker = function composeLinkPicker(Component) {
     var _props$paddingLeft, _props$paddingRight, _props$paddingTop, _props$paddingBottom, _ref2;
     var component = props.component;
     var RootComponent = component !== null && component !== void 0 ? component : DefaultRootComponent;
-
-    /**
-     * When ff enabled: root container will provide width to component + loader + error boundary
-     * When ff disabled: component + loader + error boundary each providing their own width
-     * Cannot make this change easier at risk of regression as external adopters may have css override on the form element
-     */
-    var RootFixedWidthContainer = fg('platform.linking-platform.link-picker.fixed-height-search-results') ? FixedWidthContainer : Fragment;
-    var LoaderFallbackContainer = fg('platform.linking-platform.link-picker.fixed-height-search-results') ? Fragment : FixedWidthContainer;
     return jsx(AnalyticsContext, {
       data: PACKAGE_DATA
     }, jsx(LinkPickerSessionProvider, null, jsx(MessagesProvider, null, jsx("div", {
       style: (_ref2 = {}, _defineProperty(_ref2, '--link-picker-width', props.disableWidth ? '100%' : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       "".concat(LINK_PICKER_WIDTH_IN_PX, "px")), _defineProperty(_ref2, '--link-picker-padding-left', (_props$paddingLeft = props.paddingLeft) !== null && _props$paddingLeft !== void 0 ? _props$paddingLeft : "var(--ds-space-200, 16px)"), _defineProperty(_ref2, '--link-picker-padding-right', (_props$paddingRight = props.paddingRight) !== null && _props$paddingRight !== void 0 ? _props$paddingRight : "var(--ds-space-200, 16px)"), _defineProperty(_ref2, '--link-picker-padding-top', (_props$paddingTop = props.paddingTop) !== null && _props$paddingTop !== void 0 ? _props$paddingTop : "var(--ds-space-200, 16px)"), _defineProperty(_ref2, '--link-picker-padding-bottom', (_props$paddingBottom = props.paddingBottom) !== null && _props$paddingBottom !== void 0 ? _props$paddingBottom : "var(--ds-space-200, 16px)"), _ref2)
-    }, jsx(RootFixedWidthContainer, null, jsx(ErrorBoundary, null, jsx(LazySuspense, {
-      fallback: jsx(LoaderFallbackContainer, null, jsx(LoaderFallback, {
+    }, jsx(FixedWidthContainer, null, jsx(ErrorBoundary, null, jsx(LazySuspense, {
+      fallback: jsx(LoaderFallback, {
         url: props.url,
         hideDisplayText: props.hideDisplayText,
         isLoadingPlugins: props.isLoadingPlugins,
         plugins: props.plugins
-      }))
+      })
     }, jsx(RootComponent, _extends({}, props, {
       "data-testid": testIds.linkPickerRoot
     }), jsx(Component, props)))))))));

package/dist/types/common/types.d.ts

@@ -145,6 +145,8 @@ export interface LinkPickerProps {
     }>;
     /** Allows for customisation of text in the link picker. */
     customMessages?: CustomLinkPickerMessages;
+    /** Allows height of search results to adapt to the number of results being displayed. */
+    adaptiveHeight?: boolean;
     featureFlags?: Record<string, unknown>;
     /** Controls showing a "submission in-progres" UX */
     isSubmitting?: boolean;

package/dist/types/ui/link-picker/search-results/index.d.ts

@@ -39,6 +39,7 @@ export type SearchResultsProps = {
     handleSelected: (objectId: string) => void;
     handleKeyDown: (e: KeyboardEvent<HTMLElement>) => void;
     error?: unknown;
+    adaptiveHeight: boolean;
     retry: () => void;
 };
-export declare const SearchResults: ({ tabs, activeTab, activePlugin, isLoadingPlugins, isLoadingResults, isSubmitting, handleTabChange, handleSearchListOnChange, featureFlags, linkSearchListId, error, queryState, items, activeIndex, selectedIndex, handleSelected, handleKeyDown, retry, }: SearchResultsProps) => jsx.JSX.Element;
+export declare const SearchResults: ({ tabs, activeTab, activePlugin, isLoadingPlugins, isLoadingResults, isSubmitting, handleTabChange, handleSearchListOnChange, featureFlags, linkSearchListId, error, queryState, items, activeIndex, selectedIndex, handleSelected, handleKeyDown, adaptiveHeight, retry, }: SearchResultsProps) => jsx.JSX.Element;

package/dist/types/ui/link-picker/search-results/link-search-list/index.d.ts

@@ -36,6 +36,7 @@ export interface LinkSearchListProps extends Omit<React.HTMLAttributes<LinkSearc
     isLoading: boolean;
     selectedIndex: number;
     activeIndex: number;
+    adaptiveHeight: boolean;
     onChange: (objectId: string) => void;
     onSelect: (objectId: string) => void;
     onKeyDown?: (e: KeyboardEvent<LinkSearchListElement>) => void;

package/dist/types/ui/link-picker/search-results/search-results-container/index.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="react" />
-export declare const SearchResultsContainer: import("react").ForwardRefExoticComponent<import("react").HTMLAttributes<HTMLDivElement> & {
-    hasTabs?: boolean | undefined;
+import { jsx } from '@emotion/react';
+type SearchResultsContainerProps = {
+    adaptiveHeight: boolean;
+    isLoadingResults: boolean;
+    hasTabs?: boolean;
     children?: React.ReactNode;
-} & import("react").RefAttributes<HTMLDivElement>>;
+};
+export declare const SearchResultsContainer: ({ hasTabs, adaptiveHeight, isLoadingResults, children, }: SearchResultsContainerProps) => jsx.JSX.Element;
+export {};

package/dist/types-ts4.5/common/types.d.ts

@@ -148,6 +148,8 @@ export interface LinkPickerProps {
     }>;
     /** Allows for customisation of text in the link picker. */
     customMessages?: CustomLinkPickerMessages;
+    /** Allows height of search results to adapt to the number of results being displayed. */
+    adaptiveHeight?: boolean;
     featureFlags?: Record<string, unknown>;
     /** Controls showing a "submission in-progres" UX */
     isSubmitting?: boolean;

package/dist/types-ts4.5/ui/link-picker/search-results/index.d.ts

@@ -39,6 +39,7 @@ export type SearchResultsProps = {
     handleSelected: (objectId: string) => void;
     handleKeyDown: (e: KeyboardEvent<HTMLElement>) => void;
     error?: unknown;
+    adaptiveHeight: boolean;
     retry: () => void;
 };
-export declare const SearchResults: ({ tabs, activeTab, activePlugin, isLoadingPlugins, isLoadingResults, isSubmitting, handleTabChange, handleSearchListOnChange, featureFlags, linkSearchListId, error, queryState, items, activeIndex, selectedIndex, handleSelected, handleKeyDown, retry, }: SearchResultsProps) => jsx.JSX.Element;
+export declare const SearchResults: ({ tabs, activeTab, activePlugin, isLoadingPlugins, isLoadingResults, isSubmitting, handleTabChange, handleSearchListOnChange, featureFlags, linkSearchListId, error, queryState, items, activeIndex, selectedIndex, handleSelected, handleKeyDown, adaptiveHeight, retry, }: SearchResultsProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/link-picker/search-results/link-search-list/index.d.ts

@@ -36,6 +36,7 @@ export interface LinkSearchListProps extends Omit<React.HTMLAttributes<LinkSearc
     isLoading: boolean;
     selectedIndex: number;
     activeIndex: number;
+    adaptiveHeight: boolean;
     onChange: (objectId: string) => void;
     onSelect: (objectId: string) => void;
     onKeyDown?: (e: KeyboardEvent<LinkSearchListElement>) => void;

package/dist/types-ts4.5/ui/link-picker/search-results/search-results-container/index.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="react" />
-export declare const SearchResultsContainer: import("react").ForwardRefExoticComponent<import("react").HTMLAttributes<HTMLDivElement> & {
-    hasTabs?: boolean | undefined;
+import { jsx } from '@emotion/react';
+type SearchResultsContainerProps = {
+    adaptiveHeight: boolean;
+    isLoadingResults: boolean;
+    hasTabs?: boolean;
     children?: React.ReactNode;
-} & import("react").RefAttributes<HTMLDivElement>>;
+};
+export declare const SearchResultsContainer: ({ hasTabs, adaptiveHeight, isLoadingResults, children, }: SearchResultsContainerProps) => jsx.JSX.Element;
+export {};