@elliemae/ds-global-header 2.0.0-alpha.11 → 2.0.0-alpha.12

package/cjs/GlobalHeaderContainer.js

@@ -10,12 +10,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-const GlobalHeaderContainer = ({
-  children
-}) => /*#__PURE__*/_jsx__default["default"]("header", {
-  "data-testid": "ds-global-header"
-}, void 0, /*#__PURE__*/_jsx__default["default"](styles.Wrapper, {
-  cols: ['auto', '1fr', 'auto']
-}, void 0, children));
+const GlobalHeaderContainer = _ref => {
+  let {
+    children
+  } = _ref;
+  return /*#__PURE__*/_jsx__default["default"]("header", {
+    "data-testid": "ds-global-header"
+  }, void 0, /*#__PURE__*/_jsx__default["default"](styles.Wrapper, {
+    cols: ['auto', '1fr', 'auto']
+  }, void 0, children));
+};
 
 exports.GlobalHeaderContainer = GlobalHeaderContainer;

package/cjs/components/Breadcrumb/GlobalHeaderBreadcrumb.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
 var React = require('react');
 var dsGrid = require('@elliemae/ds-grid');
 var styles = require('./styles.js');
@@ -24,14 +26,14 @@ const GlobalHeaderBreadcrumb = () => {
     setShowIconOnly,
     globalHeaderBreadcrumbGrid
   } = React.useContext(GlobalHeaderContext.GlobalHeaderContext);
-  const breakpoint = React.useRef();
-  const flexRegion = React.useRef();
+  const breakpoint = React.useRef(null);
+  const flexRegion = React.useRef(null);
   React.useEffect(() => {
     const evaluateShowIconOnly = () => {
-      if ((flexRegion === null || flexRegion === void 0 ? void 0 : flexRegion.current.offsetWidth) <= 0 && !breakpoint.current) {
+      if (flexRegion && flexRegion.current && (flexRegion === null || flexRegion === void 0 ? void 0 : flexRegion.current.offsetWidth) <= 0 && !breakpoint.current) {
         setShowIconOnly(true);
         breakpoint.current = window.innerWidth;
-      } else if (window.innerWidth >= breakpoint.current) {
+      } else if (breakpoint && breakpoint.current !== null && window.innerWidth >= breakpoint.current) {
         setShowIconOnly(false);
         breakpoint.current = null;
       }
@@ -44,13 +46,13 @@ const GlobalHeaderBreadcrumb = () => {
   return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
     height: "100%",
     alignItems: "center",
-    justifyContent: "left",
-    role: "navigation",
+    justifyContent: "flex-start",
     "aria-label": "breadcrumbs",
-    cols: globalHeaderBreadcrumbGrid
+    cols: globalHeaderBreadcrumbGrid,
+    role: "navigation"
   }, void 0, /*#__PURE__*/_jsx__default["default"](styles.Pipe, {
     showIconOnly: showIconOnly
-  }), breadcrumb.map(item => {
+  }), breadcrumb === null || breadcrumb === void 0 ? void 0 : breadcrumb.map(item => {
     const {
       label,
       hasNext,

package/cjs/components/Breadcrumb/PureBreadcrumb.js

@@ -4,32 +4,34 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Chevron = require('@elliemae/ds-icons/ChevronSmallRight');
+var dsIcons = require('@elliemae/ds-icons');
 var styles = require('./styles.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Chevron__default = /*#__PURE__*/_interopDefaultLegacy(Chevron);
 
-var _Chevron;
-const PureBreadcrumb = /*#__PURE__*/React__default["default"].memo(({
-  onClick,
-  isSelected,
-  length,
-  label,
-  hasNext
-}) => /*#__PURE__*/_jsx__default["default"](styles.BreadcrumbItem, {}, void 0, /*#__PURE__*/_jsx__default["default"](styles.LabelButton, {
-  onClick: onClick,
-  "aria-selected": isSelected,
-  "data-testid": "gh-breadcrumb-btn"
-}, void 0, /*#__PURE__*/_jsx__default["default"](styles.Label, {
-  isSelected: isSelected,
-  isOnlyItem: length === 1
-}, void 0, label)), hasNext && (_Chevron || (_Chevron = /*#__PURE__*/_jsx__default["default"](Chevron__default["default"], {
-  size: "m",
-  fill: "#FFF"
-})))));
+var _ChevronSmallRight;
+const PureBreadcrumb = /*#__PURE__*/React__default["default"].memo(_ref => {
+  let {
+    onClick,
+    isSelected,
+    length,
+    label,
+    hasNext
+  } = _ref;
+  return /*#__PURE__*/_jsx__default["default"](styles.BreadcrumbItem, {}, void 0, /*#__PURE__*/_jsx__default["default"](styles.LabelButton, {
+    onClick: onClick,
+    "aria-selected": isSelected,
+    "data-testid": "gh-breadcrumb-btn"
+  }, void 0, /*#__PURE__*/_jsx__default["default"](styles.Label, {
+    isSelected: !!isSelected,
+    isOnlyItem: length === 1
+  }, void 0, label)), hasNext && (_ChevronSmallRight || (_ChevronSmallRight = /*#__PURE__*/_jsx__default["default"](dsIcons.ChevronSmallRight, {
+    size: "m",
+    fill: "#FFF"
+  }))));
+});
 
 exports.PureBreadcrumb = PureBreadcrumb;

package/cjs/components/Breadcrumb/styles.js

@@ -10,32 +10,53 @@ var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
 const Pipe = /*#__PURE__*/styled__default["default"].span.withConfig({
   componentId: "sc-1n5l527-0"
-})(["margin:0 7px 0 0;border-left:", ";height:20px;"], ({
-  showIconOnly
-}) => showIconOnly ? 'none' : '1px solid #fff');
+})(["margin:0 7px 0 0;border-left:", ";height:20px;"], _ref => {
+  let {
+    showIconOnly
+  } = _ref;
+  return showIconOnly ? 'none' : '1px solid #fff';
+});
 const BreadcrumbItem = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-1n5l527-1"
 })(["display:flex;align-items:center;height:100%;"]);
 const LabelButton = /*#__PURE__*/styled__default["default"].button.withConfig({
   componentId: "sc-1n5l527-2"
-})(["width:fit-content;height:100%;margin:0;padding:0;border:1px solid transparent;background-color:transparent;outline:none;cursor:pointer;position:relative;&:focus{:after{content:'';position:absolute;top:0;left:-7px;width:calc(100% + 14px);height:100%;border:4px solid ", ";border-radius:6px;}:before{content:'';position:absolute;z-index:2;top:2px;left:-5px;width:calc(100% + 10px);height:calc(100% - 4px);border:2px solid ", ";border-radius:4px;}}"], ({
-  theme
-}) => theme.colors.brand[700], ({
-  theme
-}) => theme.colors.neutral['000']);
+})(["width:fit-content;height:100%;margin:0;padding:0;border:1px solid transparent;background-color:transparent;outline:none;cursor:pointer;position:relative;&:focus{:after{content:'';position:absolute;top:0;left:-7px;width:calc(100% + 14px);height:100%;border:4px solid ", ";border-radius:6px;}:before{content:'';position:absolute;z-index:2;top:2px;left:-5px;width:calc(100% + 10px);height:calc(100% - 4px);border:2px solid ", ";border-radius:4px;}}"], _ref2 => {
+  let {
+    theme
+  } = _ref2;
+  return theme.colors.brand[700];
+}, _ref3 => {
+  let {
+    theme
+  } = _ref3;
+  return theme.colors.neutral['000'];
+});
 const Label = /*#__PURE__*/styled__default["default"].p.withConfig({
   componentId: "sc-1n5l527-3"
-})(["color:", ";", ";font-size:16px;text-transform:uppercase;border-bottom:", ";margin:3px 5px 0 5px;:hover{", ";}"], ({
-  theme
-}) => theme.colors.neutral['000'], ({
-  theme,
-  isSelected
-}) => "-webkit-text-stroke: 0.4px  ".concat(isSelected ? theme.colors.neutral['000'] : 'transparent'), ({
-  isSelected,
-  isOnlyItem
-}) => "2px solid ".concat(isSelected && !isOnlyItem ? '#FFF' : 'transparent'), ({
-  theme
-}) => "-webkit-text-stroke: 0.4px ".concat(theme.colors.neutral['000']));
+})(["color:", ";", ";font-size:16px;text-transform:uppercase;border-bottom:", ";margin:3px 5px 0 5px;:hover{", ";}"], _ref4 => {
+  let {
+    theme
+  } = _ref4;
+  return theme.colors.neutral['000'];
+}, _ref5 => {
+  let {
+    theme,
+    isSelected
+  } = _ref5;
+  return "-webkit-text-stroke: 0.4px  ".concat(isSelected ? theme.colors.neutral['000'] : 'transparent');
+}, _ref6 => {
+  let {
+    isSelected,
+    isOnlyItem
+  } = _ref6;
+  return "2px solid ".concat(isSelected && !isOnlyItem ? '#FFF' : 'transparent');
+}, _ref7 => {
+  let {
+    theme
+  } = _ref7;
+  return "-webkit-text-stroke: 0.4px ".concat(theme.colors.neutral['000']);
+});
 
 exports.BreadcrumbItem = BreadcrumbItem;
 exports.Label = Label;

package/cjs/components/Toolbar/ToolbarItems.js

@@ -2,7 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _jsx = require('@babel/runtime/helpers/jsx');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var React = require('react');
 var AppPicker = require('../../outOfTheBox/AppPicker/AppPicker.js');
 var PopupMenu = require('../../outOfTheBox/PopupMenu/PopupMenu.js');
@@ -12,8 +20,12 @@ var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 const ToolbarItems = () => {
   const {
     props: {
@@ -21,7 +33,7 @@ const ToolbarItems = () => {
     },
     instanceUID
   } = React.useContext(GlobalHeaderContext.GlobalHeaderContext);
-  const itemsList = React.useMemo(() => toolbar.map(item => {
+  const itemsList = React.useMemo(() => toolbar === null || toolbar === void 0 ? void 0 : toolbar.map(item => {
     var _Icon;
 
     const {
@@ -47,24 +59,9 @@ const ToolbarItems = () => {
         }, "".concat(instanceUID, "-ds-popup-menu-").concat(label));
 
       case 'ds-app-picker':
-        const {
-          apps,
-          customApps,
-          sectionTitle,
-          customSectionTitle,
-          actionRef,
-          onKeyDown
-        } = componentProps;
-        return /*#__PURE__*/_jsx__default["default"](AppPicker.AppPicker, {
-          onClick: onClick,
-          label: label,
-          apps: apps,
-          customApps: customApps,
-          sectionTitle: sectionTitle,
-          customSectionTitle: customSectionTitle,
-          actionRef: actionRef,
-          onKeyDown: onKeyDown
-        }, "".concat(instanceUID, "-ds-app-picker-").concat(label));
+        return /*#__PURE__*/jsxRuntime.jsx(AppPicker.AppPicker, _objectSpread({
+          label: label
+        }, componentProps), "".concat(instanceUID, "-ds-app-picker-").concat(label));
 
       default:
         return /*#__PURE__*/_jsx__default["default"](styles.Button, {

package/cjs/components/Toolbar/styles.js

@@ -10,12 +10,21 @@ var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
 const Button = /*#__PURE__*/styled__default["default"].button.withConfig({
   componentId: "sc-1gqj0i3-0"
-})(["height:40px;width:40px;border:none;background-color:transparent;cursor:pointer;position:relative;outline:none;&:hover:not(:focus){background-color:", ";outline:none;}&:focus{:after{content:'';position:absolute;top:0;left:0;width:100%;height:100%;border:4px solid ", ";border-radius:4px;}:before{content:'';position:absolute;z-index:2;top:2px;left:2px;width:calc(100% - 4px);height:calc(100% - 4px);border:2px solid ", ";border-radius:4px;}}"], ({
-  theme
-}) => theme.colors.brand[700], ({
-  theme
-}) => theme.colors.brand[700], ({
-  theme
-}) => theme.colors.neutral['000']);
+})(["height:40px;width:40px;border:none;background-color:transparent;cursor:pointer;position:relative;outline:none;&:hover:not(:focus){background-color:", ";outline:none;}&:focus{:after{content:'';position:absolute;top:0;left:0;width:100%;height:100%;border:4px solid ", ";border-radius:4px;}:before{content:'';position:absolute;z-index:2;top:2px;left:2px;width:calc(100% - 4px);height:calc(100% - 4px);border:2px solid ", ";border-radius:4px;}}"], _ref => {
+  let {
+    theme
+  } = _ref;
+  return theme.colors.brand[700];
+}, _ref2 => {
+  let {
+    theme
+  } = _ref2;
+  return theme.colors.brand[700];
+}, _ref3 => {
+  let {
+    theme
+  } = _ref3;
+  return theme.colors.neutral['000'];
+});
 
 exports.Button = Button;

package/cjs/config/useGetPropsWithDefaults.js

@@ -2,6 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var defaultProps = require('../defaultProps.js');

package/cjs/config/useGlobalHeader.js

@@ -14,8 +14,16 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 const useGlobalHeader = props => {
   const [showIconOnly, setShowIconOnly] = React.useState(false);
   const instanceUID = React.useMemo(() => uid.uid(5), []);
-  const globalHeaderToolbarGrid = React.useMemo(() => props.toolbar.map(() => '1fr'), [props.toolbar]);
-  const globalHeaderBreadcrumbGrid = React.useMemo(() => ['auto', ...props.breadcrumb.map(() => 'auto'), '1fr'], [props.breadcrumb]);
+  const globalHeaderToolbarGrid = React.useMemo(() => {
+    var _props$toolbar$length, _props$toolbar;
+
+    return new Array((_props$toolbar$length = props === null || props === void 0 ? void 0 : (_props$toolbar = props.toolbar) === null || _props$toolbar === void 0 ? void 0 : _props$toolbar.length) !== null && _props$toolbar$length !== void 0 ? _props$toolbar$length : 0).fill('1fr');
+  }, [props.toolbar]);
+  const globalHeaderBreadcrumbGrid = React.useMemo(() => {
+    var _props$breadcrumb$len, _props$breadcrumb;
+
+    return ['auto', ...new Array((_props$breadcrumb$len = props === null || props === void 0 ? void 0 : (_props$breadcrumb = props.breadcrumb) === null || _props$breadcrumb === void 0 ? void 0 : _props$breadcrumb.length) !== null && _props$breadcrumb$len !== void 0 ? _props$breadcrumb$len : 0).fill('auto'), '1fr'];
+  }, [props.breadcrumb]);
   const propsWithDefaults = useGetPropsWithDefaults.useGetPropsWithDefaults(props);
   const ctx = React__default["default"].useMemo(() => ({
     props: propsWithDefaults,

package/cjs/config/useValidateProps.js

@@ -2,6 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var validateHelpers = require('./validateHelpers.js');
 
 const validatePopupItem = componentProps => {
@@ -63,7 +66,7 @@ const useValidateProps = props => {
     validateHelpers.throwLogoError('LogoWithBrand', LogoWithBrand);
   }
 
-  breadcrumb.forEach(breadcrumbItem => {
+  breadcrumb === null || breadcrumb === void 0 ? void 0 : breadcrumb.forEach(breadcrumbItem => {
     if (breadcrumbItem.label && typeof breadcrumbItem.label !== 'string') {
       validateHelpers.throwBreadcrumbItemError('label', breadcrumbItem.label);
     }
@@ -80,7 +83,7 @@ const useValidateProps = props => {
       validateHelpers.throwBreadcrumbItemError('isSelected', breadcrumbItem.isSelected);
     }
   });
-  toolbar.forEach(toolbarItem => {
+  toolbar === null || toolbar === void 0 ? void 0 : toolbar.forEach(toolbarItem => {
     validateGenericToolbarItem(toolbarItem);
 
     if (toolbarItem.type) {

package/cjs/defaultProps.js

@@ -2,11 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+const emptyComp = () => null;
+
 const defaultProps = {
   breadcrumb: [],
   toolbar: [],
-  LogoWithBrand: null,
-  Logo: null
+  LogoWithBrand: emptyComp,
+  Logo: emptyComp
 };
 
 exports.defaultProps = defaultProps;

package/cjs/outOfTheBox/AppPicker/AppPicker.js

@@ -6,77 +6,88 @@ var _jsx = require('@babel/runtime/helpers/jsx');
 require('core-js/modules/web.dom-collections.iterator.js');
 var React = require('react');
 var dsAppPicker = require('@elliemae/ds-app-picker');
-var MenuPicker = require('@elliemae/ds-icons/MenuPicker');
+var dsUtilities = require('@elliemae/ds-utilities');
+var dsIcons = require('@elliemae/ds-icons');
 var styles = require('../../components/Toolbar/styles.js');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var MenuPicker__default = /*#__PURE__*/_interopDefaultLegacy(MenuPicker);
 
 var _MenuPicker;
-const AppPicker = ({
-  label,
-  apps,
-  customApps,
-  sectionTitle,
-  customSectionTitle,
-  onClick = () => null,
-  actionRef,
-  onKeyDown: customHandleOnKeyDown = () => null
-}) => {
-  var _DSAppPicker;
-
+const AppPicker = _ref => {
+  let {
+    label,
+    apps,
+    icon,
+    customApps,
+    sectionTitle,
+    customSectionTitle,
+    actionRef,
+    isOpen: userIsOpen,
+    onKeyDown: userOnKeyDown,
+    onClickOutside: userOnClickOutside,
+    renderTrigger: userRenderTrigger,
+    onClose,
+    triggerRef,
+    triggerOnClick
+  } = _ref;
   const [isOpen, setIsOpen] = React.useState(false);
-  const buttonRef = React.useRef();
+  const buttonRef = React.useRef(null);
   const handleTriggerKeyDown = React.useCallback(e => {
     if (e.code === 'Enter' || e.code === 'Space') {
       setIsOpen(true);
     }
   }, []);
   const handleAppPickerOnKeyDown = React.useCallback(e => {
-    customHandleOnKeyDown(e);
-
     if (e.code === 'Escape') {
+      var _buttonRef$current;
+
       setIsOpen(false);
+      buttonRef === null || buttonRef === void 0 ? void 0 : (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
     }
-  }, [customHandleOnKeyDown]);
+  }, []);
   const handleOnClickOutside = React.useCallback(() => {
     setIsOpen(false);
   }, []);
-  const handleOnClick = React.useCallback(e => {
+  const handleOnClick = React.useCallback(() => {
     setIsOpen(true);
-    onClick(e);
-  }, [onClick]);
-  const trigger = React.useMemo(() => ({
-    ref
-  }) => /*#__PURE__*/jsxRuntime.jsx("div", {
-    ref: ref,
-    children: /*#__PURE__*/jsxRuntime.jsx(styles.Button, {
-      onClick: handleOnClick,
-      onKeyDown: handleTriggerKeyDown,
-      ref: buttonRef,
-      title: label,
-      "data-testid": "gh-toolbar-item",
-      children: _MenuPicker || (_MenuPicker = /*#__PURE__*/_jsx__default["default"](MenuPicker__default["default"], {
-        fill: "#FFF",
-        size: "m"
-      }))
-    })
-  }), [handleOnClick, handleTriggerKeyDown, label]);
-  return React.useMemo(() => _DSAppPicker || (_DSAppPicker = /*#__PURE__*/_jsx__default["default"](dsAppPicker.DSAppPicker, {
-    isOpen: isOpen,
+  }, []);
+  const renderTrigger = React.useMemo(() => _ref2 => {
+    let {
+      ref
+    } = _ref2;
+    return /*#__PURE__*/jsxRuntime.jsx("div", {
+      ref: ref,
+      children: /*#__PURE__*/jsxRuntime.jsx(styles.Button, {
+        onClick: triggerOnClick !== null && triggerOnClick !== void 0 ? triggerOnClick : handleOnClick,
+        onKeyDown: handleTriggerKeyDown,
+        ref: dsUtilities.mergeRefs(buttonRef, triggerRef),
+        title: label,
+        "data-testid": "gh-toolbar-item",
+        children: _MenuPicker || (_MenuPicker = /*#__PURE__*/_jsx__default["default"](dsIcons.MenuPicker, {
+          fill: "#FFF",
+          width: 20.73,
+          height: 20.73
+        }))
+      })
+    });
+  }, [triggerOnClick, handleOnClick, handleTriggerKeyDown, label]);
+  return /*#__PURE__*/_jsx__default["default"](dsAppPicker.DSAppPicker, {
     apps: apps,
     customApps: customApps,
     sectionTitle: sectionTitle,
     customSectionTitle: customSectionTitle,
-    onClickOutside: handleOnClickOutside,
-    renderTrigger: trigger,
-    triggerRef: buttonRef,
+    icon: icon,
+    onKeyDown: userOnKeyDown !== null && userOnKeyDown !== void 0 ? userOnKeyDown : handleAppPickerOnKeyDown,
     actionRef: actionRef,
-    onKeyDown: handleAppPickerOnKeyDown
-  })), [actionRef, apps, customApps, customSectionTitle, handleAppPickerOnKeyDown, handleOnClickOutside, isOpen, sectionTitle, trigger]);
+    onClickOutside: userOnClickOutside !== null && userOnClickOutside !== void 0 ? userOnClickOutside : handleOnClickOutside,
+    renderTrigger: userRenderTrigger !== null && userRenderTrigger !== void 0 ? userRenderTrigger : renderTrigger,
+    isOpen: userIsOpen !== null && userIsOpen !== void 0 ? userIsOpen : isOpen,
+    onClose: onClose,
+    triggerRef: triggerRef
+  });
 };
 
 exports.AppPicker = AppPicker;

package/cjs/outOfTheBox/PopupMenu/PopupMenu.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('core-js/modules/web.dom-collections.iterator.js');
 var React = require('react');
-var Popover = require('@elliemae/ds-popover');
+var dsPopperjs = require('@elliemae/ds-popperjs');
 var PopupMenuContent = require('./PopupMenuContent.js');
 var styles = require('../../components/Toolbar/styles.js');
 var jsxRuntime = require('react/jsx-runtime');
@@ -13,30 +13,28 @@ var jsxRuntime = require('react/jsx-runtime');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var Popover__default = /*#__PURE__*/_interopDefaultLegacy(Popover);
 
-const PopupMenu = ({
-  Icon,
-  options,
-  closeOnClick,
-  title,
-  onClick
-}) => {
+const PopupMenu = _ref => {
   var _PopupMenuContent;
 
+  let {
+    Icon,
+    options,
+    closeOnClick,
+    title,
+    onClick
+  } = _ref;
   const [isOpen, setIsOpen] = React.useState(false);
-  const buttonRef = React.useRef();
+  const [buttonRef, setButtonRef] = React.useState(null);
   const handleKeyPress = React.useCallback(e => {
     if (e.code === 'Enter' || e.code === 'Space') {
       setIsOpen(true);
     }
   }, []);
   const handleOnClose = React.useCallback(() => {
-    var _buttonRef$current;
-
     setIsOpen(false);
-    (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
-  }, []);
+    buttonRef === null || buttonRef === void 0 ? void 0 : buttonRef.focus();
+  }, [buttonRef]);
   const handleTriggerOnClick = React.useCallback(e => {
     setIsOpen(true);
     onClick(e);
@@ -44,39 +42,26 @@ const PopupMenu = ({
   const handleItemClick = React.useCallback(() => {
     if (closeOnClick) handleOnClose();
   }, [closeOnClick, handleOnClose]);
-  const handleClickOutside = React.useCallback(() => setIsOpen(false), []);
   const content = React.useMemo(() => _PopupMenuContent || (_PopupMenuContent = /*#__PURE__*/_jsx__default["default"](PopupMenuContent.PopupMenuContent, {
     options: options,
     onItemClick: handleItemClick,
     onClose: handleOnClose
   })), [options, handleItemClick, handleOnClose]);
-  const trigger = React.useMemo(() => ({
-    ref
-  }) => /*#__PURE__*/jsxRuntime.jsx(styles.Button, {
+  return /*#__PURE__*/_jsx__default["default"]("div", {}, void 0, /*#__PURE__*/jsxRuntime.jsx(styles.Button, {
     onClick: handleTriggerOnClick,
     onKeyPress: handleKeyPress,
     title: title,
-    ref: buttonRef,
+    ref: setButtonRef,
     "data-testid": "gh-toolbar-item",
-    children: /*#__PURE__*/_jsx__default["default"](Icon, {
-      innerRef: ref,
+    children: Icon && /*#__PURE__*/_jsx__default["default"](Icon, {
       fill: "#FFF",
       size: "m"
     })
-  }), [Icon, handleKeyPress, handleTriggerOnClick, title]);
-  return React.useMemo(() => /*#__PURE__*/_jsx__default["default"](Popover__default["default"], {
-    isOpen: isOpen,
-    content: content,
-    onClickOutside: handleClickOutside,
-    placement: "bottom",
-    interactionType: "click",
-    showArrow: true,
-    style: {
-      padding: '0',
-      width: 'fit-content'
-    },
-    renderTrigger: trigger
-  }), [content, handleClickOutside, isOpen, trigger]);
+  }), /*#__PURE__*/_jsx__default["default"](dsPopperjs.DSPopperJS, {
+    referenceElement: buttonRef,
+    showPopover: isOpen,
+    closeContextMenu: handleOnClose
+  }, void 0, content));
 };
 
 exports.PopupMenu = PopupMenu;