@atlaskit/editor-core 171.0.0 → 172.0.1

package/dist/esm/ui/DropList/index.js

@@ -0,0 +1,203 @@
+import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+var _templateObject, _templateObject2, _templateObject3;
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+/** @jsx jsx */
+import { Component } from 'react';
+import { css, jsx } from '@emotion/react';
+import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
+import Layer from '../Layer';
+import { borderRadius, gridSize } from '@atlaskit/theme/constants';
+import { N0, DN50, DN600, N50A, N60A, N900 } from '@atlaskit/theme/colors';
+import { themed } from '@atlaskit/theme/components';
+import { token } from '@atlaskit/tokens';
+var packageName = "@atlaskit/editor-core";
+var packageVersion = "172.0.1";
+var halfFocusRing = 1;
+var dropOffset = "0, ".concat(gridSize(), "px");
+
+var DropList = /*#__PURE__*/function (_Component) {
+  _inherits(DropList, _Component);
+
+  var _super = _createSuper(DropList);
+
+  function DropList() {
+    var _this;
+
+    _classCallCheck(this, DropList);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "wrapperStyles", css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    ", "\n    transition-duration: 0.2s;\n    transition: box-shadow 0.15s cubic-bezier(0.47, 0.03, 0.49, 1.38);\n  "])), _this.props.shouldFitContainer ? 'display: block; flex: 1 1 auto;' : 'display: inline-flex;'));
+
+    _defineProperty(_assertThisInitialized(_this), "triggerStyles", css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    transition-duration: 0.2s;\n    transition: box-shadow 0.15s cubic-bezier(0.47, 0.03, 0.49, 1.38);\n    ", "\n  "])), _this.props.shouldFitContainer ? 'display: block; box-sizing: border-box;' : 'display: inline-flex;'));
+
+    _defineProperty(_assertThisInitialized(_this), "menuWrapper", function (theme) {
+      return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n      color: ", ";\n      background-color: ", ";\n      border-radius: ", "px;\n      box-shadow: 0 ", "px ", "px -", "px ", ",\n        0 0 1px ", ";\n      box-sizing: border-box;\n      overflow: auto;\n      padding: ", "px 0;\n      max-height: 90vh;\n    "])), themed({
+        light: token('color.text', N900),
+        dark: token('color.text', DN600)
+      })(theme), themed({
+        light: token('elevation.surface.overlay', N0),
+        dark: token('elevation.surface.overlay', DN50)
+      })(theme), borderRadius(), gridSize() / 2, gridSize(), gridSize() / 4, N50A, N60A, gridSize() / 2);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "componentDidMount", function () {
+      _this.setContentWidth(); // We use a captured event here to avoid a radio or checkbox dropdown item firing its
+      // click event first, which would cause a re-render of the element and prevent DropList
+      // from detecting the actual source of this original click event.
+
+
+      document.addEventListener('click', _this.handleClickOutside, true);
+      document.addEventListener('keydown', _this.handleEsc);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "componentDidUpdate", function () {
+      if (_this.props.isOpen) {
+        _this.setContentWidth();
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "componentWillUnmount", function () {
+      document.removeEventListener('click', _this.handleClickOutside, true);
+      document.removeEventListener('keydown', _this.handleEsc);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "setContentWidth", function () {
+      var _assertThisInitialize = _assertThisInitialized(_this),
+          dropContentRef = _assertThisInitialize.dropContentRef,
+          triggerRef = _assertThisInitialize.triggerRef;
+
+      var shouldFitContainer = _this.props.shouldFitContainer; // We need to manually set the content width to match the trigger width
+
+      if (shouldFitContainer && dropContentRef && triggerRef) {
+        dropContentRef.style.width = "".concat(triggerRef.offsetWidth - halfFocusRing * 2, "px");
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "handleEsc", function (event) {
+      if ((event.key === 'Escape' || event.key === 'Esc') && _this.props.isOpen) {
+        _this.close(event);
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "handleClickOutside", function (event) {
+      if (_this.props.isOpen) {
+        if (event.target instanceof Node) {
+          // Rather than check for the target within the entire DropList, we specify the trigger/content.
+          // This aids with future effort in scroll-locking DropList when isMenuFixed is enabled; the scroll
+          // blanket which stretches to the viewport should not stop 'close' from being triggered.
+          var withinTrigger = _this.triggerRef && _this.triggerRef.contains(event.target);
+
+          var withinContent = _this.dropContentRef && _this.dropContentRef.contains(event.target);
+
+          if (!withinTrigger && !withinContent) {
+            _this.close(event);
+          }
+        }
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "close", function (event) {
+      if (_this.props.onOpenChange) {
+        _this.props.onOpenChange({
+          isOpen: false,
+          event: event
+        });
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "handleContentRef", function (ref) {
+      _this.dropContentRef = ref; // If the dropdown has just been opened, we focus on the containing element so the
+      // user can tab to the first dropdown item. We will only receive this ref if isOpen
+      // is true or null, so no need to check for truthiness here.
+
+      if (ref) {
+        ref.focus();
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "handleTriggerRef", function (ref) {
+      _this.triggerRef = ref;
+    });
+
+    return _this;
+  }
+
+  _createClass(DropList, [{
+    key: "getChildContext",
+    value: function getChildContext() {
+      return {
+        shouldAllowMultilineItems: false
+      };
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this2 = this;
+
+      var _this$props = this.props,
+          children = _this$props.children,
+          isOpen = _this$props.isOpen,
+          position = _this$props.position,
+          trigger = _this$props.trigger,
+          onPositioned = _this$props.onPositioned,
+          testId = _this$props.testId;
+      var layerContent = isOpen ? jsx("div", {
+        css: function css(theme) {
+          return _this2.menuWrapper({
+            theme: theme
+          });
+        },
+        "data-role": "droplistContent",
+        "data-testid": testId && "".concat(testId, "--content"),
+        ref: this.handleContentRef
+      }, children) : null;
+      return jsx("div", {
+        css: this.wrapperStyles
+      }, jsx(Layer, {
+        content: layerContent,
+        offset: dropOffset,
+        position: position,
+        onPositioned: onPositioned
+      }, jsx("div", {
+        css: this.triggerStyles,
+        ref: this.handleTriggerRef
+      }, trigger)));
+    }
+  }]);
+
+  return DropList;
+}(Component);
+
+var createAndFireEventOnAtlaskit = createAndFireEvent('atlaskit');
+export default withAnalyticsContext({
+  componentName: 'droplist',
+  packageName: packageName,
+  packageVersion: packageVersion
+})(withAnalyticsEvents({
+  onOpenChange: createAndFireEventOnAtlaskit({
+    action: 'toggled',
+    actionSubject: 'droplist',
+    attributes: {
+      componentName: 'droplist',
+      packageName: packageName,
+      packageVersion: packageVersion
+    }
+  })
+})(DropList));

package/dist/esm/ui/Dropdown/index.js

@@ -11,9 +11,8 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import React from 'react';
-import { PureComponent } from 'react'; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
-
-import DropdownList from '@atlaskit/droplist';
+import { PureComponent } from 'react';
+import DropdownList from '../DropList';
 import { Popup } from '@atlaskit/editor-common/ui';
 import withOuterListeners from '../with-outer-listeners';
 
@@ -83,12 +82,9 @@ export var Dropdown = /*#__PURE__*/function (_PureComponent) {
           minWidth: fitWidth || 0
         }
       }, /*#__PURE__*/React.createElement(DropdownList, {
-        disabled: true,
         isOpen: true,
         onOpenChange: onOpenChange,
-        appearance: "tall",
         position: popupPlacement.join(' '),
-        shouldFlip: false,
         shouldFitContainer: true
       }, children)));
     }

package/dist/esm/ui/DropdownMenu/index.js

@@ -1,3 +1,5 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -6,6 +8,7 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+var _excluded = ["children"];
 
 var _templateObject, _templateObject2, _templateObject3;
 
@@ -14,29 +17,45 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 /** @jsx jsx */
-import { PureComponent } from 'react';
-import { css, jsx } from '@emotion/react'; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
-
-import DropList from '@atlaskit/droplist'; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
-
-import Item, { ItemGroup } from '@atlaskit/item';
+import React, { PureComponent } from 'react';
+import { css, jsx } from '@emotion/react';
+import DropList from '../DropList';
+import { CustomItem, MenuGroup } from '@atlaskit/menu';
 import Tooltip from '@atlaskit/tooltip';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import withOuterListeners from '../with-outer-listeners';
+import { DN600, DN80, N70, N900 } from '@atlaskit/theme/colors';
+import { themed } from '@atlaskit/theme/components';
+import { token } from '@atlaskit/tokens';
 var wrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  /* tooltip in ToolbarButton is display:block */\n  & > div > div {\n    display: flex;\n  }\n"])));
-var DropListWithOutsideListeners = withOuterListeners(DropList);
-/**
- * Hack for item to imitate old dropdown-menu selected styles
- */
-// TODO: https://product-fabric.atlassian.net/browse/DSP-4500
 
-/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+var buttonStyles = function buttonStyles(isActive) {
+  return function (theme) {
+    if (isActive) {
+      /**
+       * Hack for item to imitate old dropdown-menu selected styles
+       */
+      // TODO: https://product-fabric.atlassian.net/browse/DSP-4500
 
-var itemWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  && > span,\n  && > span:hover {\n    background: #6c798f;\n    color: #fff;\n  }\n"])));
-/* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
+      /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+      return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n      > span,\n      > span:hover {\n        background: #6c798f;\n        color: #fff;\n      }\n    "])));
+    } else {
+      return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n      > span:hover[aria-disabled='false'] {\n        color: ", ";\n        background-color: ", ";\n      }\n      > span[aria-disabled='true'] {\n        color: ", ";\n      }\n    "])), themed({
+        light: token('color.text', N900),
+        dark: token('color.text', DN600)
+      })(theme), themed({
+        light: token('color.background.neutral.subtle.hovered', 'rgb(244, 245, 247)'),
+        dark: token('color.background.neutral.subtle.hovered', 'rgb(59, 71, 92)')
+      })(theme), themed({
+        light: token('color.text.disabled', N70),
+        dark: token('color.text.disabled', DN80)
+      })(theme));
+    }
+  };
+};
 
-var itemContentWrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  margin-left: 8px;\n"])));
+var DropListWithOutsideListeners = withOuterListeners(DropList);
 /**
  * Wrapper around @atlaskit/droplist which uses Popup and Portal to render
  * dropdown-menu outside of "overflow: hidden" containers when needed.
@@ -92,62 +111,6 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
   }
 
   _createClass(DropdownMenuWrapper, [{
-    key: "renderItem",
-    value: function renderItem(item) {
-      var _this$props = this.props,
-          onItemActivated = _this$props.onItemActivated,
-          _onMouseEnter = _this$props.onMouseEnter,
-          _onMouseLeave = _this$props.onMouseLeave,
-          shouldUseDefaultRole = _this$props.shouldUseDefaultRole; // onClick and value.name are the action indicators in the handlers
-      // If neither are present, don't wrap in an Item.
-
-      if (!item.onClick && !item.value && !item.value.name) {
-        return jsx("span", {
-          key: String(item.content)
-        }, item.content);
-      }
-
-      var dropListItem = jsx("div", {
-        css: item.isActive ? itemWrapper : '',
-        key: item.key || item.content
-      }, jsx(Item, {
-        role: shouldUseDefaultRole ? 'button' : 'menuitem',
-        elemBefore: item.elemBefore,
-        elemAfter: item.elemAfter,
-        isDisabled: item.isDisabled,
-        onClick: function onClick() {
-          return onItemActivated && onItemActivated({
-            item: item
-          });
-        },
-        onMouseEnter: function onMouseEnter() {
-          return _onMouseEnter && _onMouseEnter({
-            item: item
-          });
-        },
-        onMouseLeave: function onMouseLeave() {
-          return _onMouseLeave && _onMouseLeave({
-            item: item
-          });
-        },
-        className: item.className,
-        "aria-label": item.label || String(item.content),
-        "aria-pressed": shouldUseDefaultRole ? item.isActive : undefined
-      }, jsx("span", {
-        css: !!item.elemBefore ? itemContentWrapper : ''
-      }, item.content)));
-
-      if (item.tooltipDescription) {
-        return jsx(Tooltip, {
-          key: item.key || item.content,
-          content: item.tooltipDescription,
-          position: item.tooltipPosition
-        }, dropListItem);
-      }
-
-      return dropListItem;
-    }
-  }, {
     key: "renderDropdownMenu",
     value: function renderDropdownMenu() {
       var _this2 = this;
@@ -155,17 +118,17 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
       var _this$state = this.state,
           target = _this$state.target,
           popupPlacement = _this$state.popupPlacement;
-      var _this$props2 = this.props,
-          items = _this$props2.items,
-          mountTo = _this$props2.mountTo,
-          boundariesElement = _this$props2.boundariesElement,
-          scrollableElement = _this$props2.scrollableElement,
-          offset = _this$props2.offset,
-          fitHeight = _this$props2.fitHeight,
-          fitWidth = _this$props2.fitWidth,
-          isOpen = _this$props2.isOpen,
-          zIndex = _this$props2.zIndex,
-          shouldUseDefaultRole = _this$props2.shouldUseDefaultRole;
+      var _this$props = this.props,
+          items = _this$props.items,
+          mountTo = _this$props.mountTo,
+          boundariesElement = _this$props.boundariesElement,
+          scrollableElement = _this$props.scrollableElement,
+          offset = _this$props.offset,
+          fitHeight = _this$props.fitHeight,
+          fitWidth = _this$props.fitWidth,
+          isOpen = _this$props.isOpen,
+          zIndex = _this$props.zIndex,
+          shouldUseDefaultRole = _this$props.shouldUseDefaultRole;
       return jsx(Popup, {
         target: isOpen ? target : undefined,
         mountTo: mountTo,
@@ -191,20 +154,29 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
           minWidth: fitWidth || 0
         }
       }), items.map(function (group, index) {
-        return jsx(ItemGroup, {
+        return jsx(MenuGroup, {
           key: index,
           role: shouldUseDefaultRole ? 'group' : 'menu'
         }, group.items.map(function (item) {
-          return _this2.renderItem(item);
+          var _item$key;
+
+          return jsx(DropdownMenuItem, {
+            key: (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : String(item.content),
+            item: item,
+            onItemActivated: _this2.props.onItemActivated,
+            shouldUseDefaultRole: _this2.props.shouldUseDefaultRole,
+            onMouseEnter: _this2.props.onMouseEnter,
+            onMouseLeave: _this2.props.onMouseLeave
+          });
         }));
       })));
     }
   }, {
     key: "render",
     value: function render() {
-      var _this$props3 = this.props,
-          children = _this$props3.children,
-          isOpen = _this$props3.isOpen;
+      var _this$props2 = this.props,
+          children = _this$props2.children,
+          isOpen = _this$props2.isOpen;
       return jsx("div", {
         css: wrapper
       }, jsx("div", {
@@ -216,4 +188,78 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
   return DropdownMenuWrapper;
 }(PureComponent);
 
-export { DropdownMenuWrapper as default };
+export { DropdownMenuWrapper as default };
+var DropdownMenuItemCustomComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var children = props.children,
+      rest = _objectWithoutProperties(props, _excluded);
+
+  return jsx("span", _extends({
+    ref: ref
+  }, rest), children);
+});
+
+function DropdownMenuItem(_ref) {
+  var _item$key2;
+
+  var item = _ref.item,
+      onItemActivated = _ref.onItemActivated,
+      shouldUseDefaultRole = _ref.shouldUseDefaultRole,
+      _onMouseEnter = _ref.onMouseEnter,
+      _onMouseLeave = _ref.onMouseLeave;
+
+  // onClick and value.name are the action indicators in the handlers
+  // If neither are present, don't wrap in an Item.
+  if (!item.onClick && !(item.value && item.value.name)) {
+    return jsx("span", {
+      key: String(item.content)
+    }, item.content);
+  }
+
+  var dropListItem = jsx("div", {
+    css: function css(theme) {
+      return buttonStyles(item.isActive)({
+        theme: theme
+      });
+    }
+  }, jsx(CustomItem, {
+    item: item,
+    key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
+    role: shouldUseDefaultRole ? 'button' : 'menuitem',
+    iconBefore: item.elemBefore,
+    iconAfter: item.elemAfter,
+    isDisabled: item.isDisabled,
+    onClick: function onClick() {
+      return onItemActivated && onItemActivated({
+        item: item
+      });
+    },
+    "aria-label": item['aria-label'] || String(item.content),
+    "aria-pressed": shouldUseDefaultRole ? item.isActive : undefined,
+    onMouseDown: function onMouseDown(e) {
+      e.preventDefault();
+    },
+    component: DropdownMenuItemCustomComponent,
+    onMouseEnter: function onMouseEnter() {
+      return _onMouseEnter && _onMouseEnter({
+        item: item
+      });
+    },
+    onMouseLeave: function onMouseLeave() {
+      return _onMouseLeave && _onMouseLeave({
+        item: item
+      });
+    }
+  }, item.content));
+
+  if (item.tooltipDescription) {
+    var _item$key3;
+
+    return jsx(Tooltip, {
+      key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
+      content: item.tooltipDescription,
+      position: item.tooltipPosition
+    }, dropListItem);
+  }
+
+  return dropListItem;
+}

package/dist/esm/ui/ElementBrowser/components/ElementList/ElementList.js

@@ -1,13 +1,14 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 import _extends from "@babel/runtime/helpers/extends";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 
 var _excluded = ["items", "mode", "selectedItemIndex", "focusedItemIndex", "setColumnCount", "createAnalyticsEvent", "emptyStateHandler", "selectedCategory", "searchTerm"];
 
 /** @jsx jsx */
-import React, { Fragment, memo, useCallback, useEffect, useMemo } from 'react';
+import React, { Fragment, memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer';
 import { Collection } from 'react-virtualized/dist/commonjs/Collection';
@@ -21,13 +22,13 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '../../..
 import IconFallback from '../../../../plugins/quick-insert/assets/fallback';
 import { itemIcon } from '../../../../plugins/type-ahead/ui/TypeAheadListItem';
 import { shortcutStyle } from '../../../styles';
-import { ELEMENT_LIST_PADDING, SCROLLBAR_THUMB_COLOR, SCROLLBAR_TRACK_COLOR, SCROLLBAR_WIDTH } from '../../constants';
+import { ELEMENT_LIST_PADDING, SCROLLBAR_WIDTH } from '../../constants';
 import useContainerWidth from '../../hooks/use-container-width';
 import useFocus from '../../hooks/use-focus';
 import { Modes } from '../../types';
 import cellSizeAndPositionGetter from './cellSizeAndPositionGetter';
 import EmptyState from './EmptyState';
-import { getColumnCount } from './utils';
+import { getColumnCount, getScrollbarWidth } from './utils';
 
 function ElementList(_ref) {
   var items = _ref.items,
@@ -45,6 +46,11 @@ function ElementList(_ref) {
       containerWidth = _useContainerWidth.containerWidth,
       ContainerWidthMonitor = _useContainerWidth.ContainerWidthMonitor;
 
+  var _useState = useState(SCROLLBAR_WIDTH),
+      _useState2 = _slicedToArray(_useState, 2),
+      scrollbarWidth = _useState2[0],
+      setScrollbarWidth = _useState2[1];
+
   var fullMode = mode === Modes.full;
   useEffect(function () {
     /**
@@ -53,8 +59,13 @@ function ElementList(_ref) {
      **/
     if (fullMode && containerWidth > 0) {
       setColumnCount(getColumnCount(containerWidth));
+      var updatedScrollbarWidth = getScrollbarWidth();
+
+      if (updatedScrollbarWidth > 0) {
+        setScrollbarWidth(updatedScrollbarWidth);
+      }
     }
-  }, [fullMode, containerWidth, setColumnCount]);
+  }, [fullMode, containerWidth, setColumnCount, scrollbarWidth]);
   var onExternalLinkClick = useCallback(function () {
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
@@ -104,7 +115,7 @@ function ElementList(_ref) {
     return jsx(Collection, {
       cellCount: items.length,
       cellRenderer: cellRenderer,
-      cellSizeAndPositionGetter: cellSizeAndPositionGetter(containerWidth),
+      cellSizeAndPositionGetter: cellSizeAndPositionGetter(containerWidth - ELEMENT_LIST_PADDING * 2, scrollbarWidth),
       height: height,
       width: containerWidth - ELEMENT_LIST_PADDING * 2 // containerWidth - padding on Left/Right (for focus outline)
 
@@ -226,22 +237,21 @@ var ItemContent = /*#__PURE__*/memo(function (_ref6) {
     css: itemDescription
   }, description)));
 });
-var scrollbarStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ::-webkit-scrollbar {\n    width: ", "px;\n  }\n  ::-webkit-scrollbar-track-piece {\n    background: ", ";\n  }\n  ::-webkit-scrollbar-thumb {\n    background: ", ";\n  }\n\n  /** Firefox **/\n  scrollbar-color: ", " ", ";\n\n  -ms-overflow-style: -ms-autohiding-scrollbar;\n"])), SCROLLBAR_WIDTH, SCROLLBAR_TRACK_COLOR, SCROLLBAR_THUMB_COLOR, SCROLLBAR_THUMB_COLOR, SCROLLBAR_TRACK_COLOR);
-var elementItemsWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  flex: 1;\n  flex-flow: row wrap;\n  align-items: flex-start;\n  justify-content: flex-start;\n  overflow: hidden;\n  padding: ", "px; // For Focus outline\n\n  .ReactVirtualized__Collection {\n    ", ";\n    border-radius: 3px; // Standard border-radius across other components like Search or Item.\n    outline: none;\n\n    :focus {\n      box-shadow: 0 0 0 ", "px\n        ", ";\n    }\n  }\n  .ReactVirtualized__Collection__innerScrollContainer {\n    div[class='element-item-wrapper']:last-child {\n      padding-bottom: 4px;\n    }\n  }\n"])), ELEMENT_LIST_PADDING, scrollbarStyle, ELEMENT_LIST_PADDING, token('color.border.focused', B100));
-var elementItemWrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  div {\n    button {\n      height: 75px;\n      align-items: flex-start;\n      padding: 12px 12px 11px;\n    }\n  }\n"])));
-var itemBody = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n  line-height: 1.4;\n  width: 100%;\n\n  margin-top: -2px; // Fixes the Item Icon and text's alignment issue\n"])));
+var elementItemsWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  flex: 1;\n  flex-flow: row wrap;\n  align-items: flex-start;\n  justify-content: flex-start;\n  overflow: hidden;\n  padding: ", "px; // For Focus outline\n\n  .ReactVirtualized__Collection {\n    border-radius: 3px; // Standard border-radius across other components like Search or Item.\n    outline: none;\n\n    :focus {\n      box-shadow: 0 0 0 ", "px\n        ", ";\n    }\n  }\n  .ReactVirtualized__Collection__innerScrollContainer {\n    div[class='element-item-wrapper']:last-child {\n      padding-bottom: 4px;\n    }\n  }\n"])), ELEMENT_LIST_PADDING, ELEMENT_LIST_PADDING, token('color.border.focused', B100));
+var elementItemWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  div {\n    button {\n      height: 75px;\n      align-items: flex-start;\n      padding: 12px 12px 11px;\n    }\n  }\n"])));
+var itemBody = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n  line-height: 1.4;\n  width: 100%;\n\n  margin-top: -2px; // Fixes the Item Icon and text's alignment issue\n"])));
 /*
  * -webkit-line-clamp is also supported by firefox 🎉
  * https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Releases/68#CSS
  */
 
-var multilineStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n"])));
-var itemDescription = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  ", ";\n\n  overflow: hidden;\n  font-size: ", ";\n  color: ", ";\n  margin-top: 2px;\n"])), multilineStyle, relativeFontSizeToBase16(11.67), token('color.text.subtle', N200));
-var itemText = css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  width: inherit;\n  white-space: initial;\n"])));
-var itemTitleWrapper = css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between; // Title and keyboardshortcut are rendered in the same block\n"])));
-var itemTitle = css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  width: 100%;\n  overflow: hidden;\n\n  white-space: nowrap;\n  text-overflow: ellipsis;\n"])));
-var itemAfter = css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  flex: 0 0 auto;\n"])));
-var itemIconStyle = css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  img {\n    height: 40px;\n    width: 40px;\n    object-fit: cover;\n  }\n"])));
+var multilineStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n"])));
+var itemDescription = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  ", ";\n\n  overflow: hidden;\n  font-size: ", ";\n  color: ", ";\n  margin-top: 2px;\n"])), multilineStyle, relativeFontSizeToBase16(11.67), token('color.text.subtle', N200));
+var itemText = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: inherit;\n  white-space: initial;\n"])));
+var itemTitleWrapper = css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between; // Title and keyboardshortcut are rendered in the same block\n"])));
+var itemTitle = css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  width: 100%;\n  overflow: hidden;\n\n  white-space: nowrap;\n  text-overflow: ellipsis;\n"])));
+var itemAfter = css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  flex: 0 0 auto;\n"])));
+var itemIconStyle = css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  img {\n    height: 40px;\n    width: 40px;\n    object-fit: cover;\n  }\n"])));
 var MemoizedElementListWithAnalytics = /*#__PURE__*/memo(withAnalyticsContext({
   component: 'ElementList'
 })(ElementList));

package/dist/esm/ui/ElementBrowser/components/ElementList/cellSizeAndPositionGetter.js

@@ -1,4 +1,4 @@
-import { ELEMENT_ITEM_HEIGHT, SCROLLBAR_WIDTH } from '../../constants';
+import { ELEMENT_ITEM_HEIGHT } from '../../constants';
 import { generateVirtualizedContainerDatum } from './utils';
 /**
  * Callback responsible for returning size and offset/position information
@@ -6,7 +6,7 @@ import { generateVirtualizedContainerDatum } from './utils';
  * https://github.com/bvaughn/react-virtualized/blob/master/docs/Collection.md
  **/
 
-export default function cellSizeAndPositionGetter(containerWidth) {
+export default function cellSizeAndPositionGetter(containerWidth, scrollbarWidth) {
   var GUTTER_SIZE = 4;
   /**
    * Save the currently rendered columnY positions.
@@ -19,7 +19,7 @@ export default function cellSizeAndPositionGetter(containerWidth) {
 
     var _generateVirtualizedC = generateVirtualizedContainerDatum(containerWidth, {
       gutterSize: GUTTER_SIZE,
-      scrollbarWidth: SCROLLBAR_WIDTH
+      scrollbarWidth: scrollbarWidth
     }),
         columnCount = _generateVirtualizedC.columnCount,
         availableWidth = _generateVirtualizedC.availableWidth;