@elliemae/ds-app-picker 3.21.2-rc.2 → 3.21.2-rc.3

package/dist/cjs/AppPickerImpl.js

@@ -39,6 +39,7 @@ var import_utils = require("./utils.js");
 var import_styles = require("./styles.js");
 var import_useKeepTrackButtons = require("./hooks/useKeepTrackButtons.js");
 var import_DSAppPickerDefinitions = require("./DSAppPickerDefinitions.js");
+var import_ds_utilities = require("@elliemae/ds-utilities");
 const AppPickerImpl = ({
   apps,
   customApps,
@@ -59,30 +60,8 @@ const AppPickerImpl = ({
     actionRef,
     triggerIsInternal
   });
-  const handleKeyDown = (0, import_react.useCallback)(
-    (e) => {
-      switch (e.key) {
-        case import_utils.keys.ESC:
-          triggerRef?.current?.focus();
-          close();
-          break;
-        case import_utils.keys.TAB:
-          if (e.shiftKey) {
-            if (e.target === allFocusableButtons.current[0]) {
-              e.preventDefault();
-              allFocusableButtons?.current[allFocusableButtons.current.length - 1]?.focus();
-            }
-          } else if (e.target === allFocusableButtons.current[allFocusableButtons.current.length - 1]) {
-            e.preventDefault();
-            allFocusableButtons?.current[0]?.focus();
-          }
-          break;
-        default:
-          break;
-      }
-    },
-    [allFocusableButtons, close, triggerRef]
-  );
+  const firstElementRef = (0, import_react.useRef)(null);
+  const lastElementRef = (0, import_react.useRef)(null);
   const handleOnClick = (0, import_react.useCallback)(
     (app) => (e) => {
       if (app.onClick)
@@ -95,11 +74,19 @@ const AppPickerImpl = ({
       if (onKeyDown)
         onKeyDown(e);
       if (!onKeyDown && e.key === import_utils.keys.ESC) {
+        triggerRef?.current?.focus();
         close();
       }
     },
-    [onKeyDown, close]
+    [onKeyDown, triggerRef, close]
   );
+  firstElementRef.current = allFocusableButtons[0];
+  lastElementRef.current = allFocusableButtons[allFocusableButtons.length - 1];
+  const handleOnKeyDown = (0, import_ds_utilities.useFocusTrap)({
+    firstElementRef,
+    lastElementRef,
+    onKeyDown: handleOnKeyDownWrapper
+  });
   const totalAppsLength = (0, import_react.useMemo)(() => apps.length + customApps.length, [apps.length, customApps.length]);
   const buildRows = (0, import_react.useCallback)(
     (appList, prevIndex, title) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: appList.map((app, index) => {
@@ -109,7 +96,6 @@ const AppPickerImpl = ({
         import_ds_chip.DSChip,
         {
           onClick: handleOnClick(app),
-          onKeyDown: handleKeyDown,
           "data-testid": import_DSAppPickerDefinitions.DSAppPickerDataTestIds.CHIP,
           "aria-disabled": disabled,
           disabled,
@@ -124,7 +110,7 @@ const AppPickerImpl = ({
         index
       ) });
     }) }),
-    [handleKeyDown, handleOnClick, totalAppsLength]
+    [handleOnClick, totalAppsLength]
   );
   const AppsRows = (0, import_react.useMemo)(() => buildRows(apps, 1, sectionTitle), [apps, buildRows, sectionTitle]);
   const CustomRows = (0, import_react.useMemo)(
@@ -156,7 +142,7 @@ const AppPickerImpl = ({
       forwardedAs: "ul",
       role: "listbox",
       ref: convertedTypeReference,
-      onKeyDown: handleOnKeyDownWrapper,
+      onKeyDown: handleOnKeyDown,
       "data-testid": import_DSAppPickerDefinitions.DSAppPickerDataTestIds.WRAPPER,
       isOverflow,
       cols: layout.cols,

package/dist/cjs/AppPickerImpl.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/AppPickerImpl.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable max-lines */\n/* eslint-disable react/no-array-index-key */\nimport React, { useCallback, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils.js';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles.js';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds } from './DSAppPickerDefinitions.js';\n\ninterface AppPickerImplProps\n  extends Omit<\n    DSAppPickerT.InternalProps,\n    'onClose' | 'icon' | 'onClick' | 'onClickOutside' | 'renderTrigger' | 'isOpen'\n  > {\n  close: () => void;\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  isOverflow: boolean;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  triggerIsInternal: boolean;\n}\n\nconst AppPickerImpl: React.ComponentType<AppPickerImplProps> = ({\n  apps,\n  customApps,\n  sectionTitle,\n  customSectionTitle,\n  close,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n  triggerIsInternal,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons({\n    wrapperRef,\n    wasOpenedByKeyboardRef,\n    actionRef,\n    triggerIsInternal,\n  });\n\n  // eslint-disable-next-line max-statements\n  const handleKeyDown = useCallback(\n    (e: React.KeyboardEvent) => {\n      switch (e.key) {\n        case keys.ESC:\n          triggerRef?.current?.focus();\n          close();\n          break;\n        case keys.TAB:\n          if (e.shiftKey) {\n            if (e.target === allFocusableButtons.current[0]) {\n              e.preventDefault();\n              allFocusableButtons?.current[allFocusableButtons.current.length - 1]?.focus();\n            }\n          } else if (e.target === allFocusableButtons.current[allFocusableButtons.current.length - 1]) {\n            e.preventDefault();\n            allFocusableButtons?.current[0]?.focus();\n          }\n          break;\n        default:\n          break;\n      }\n    },\n    [allFocusableButtons, close, triggerRef],\n  );\n\n  const handleOnClick = useCallback(\n    (app: DSAppPickerT.AppItem) => (e: React.MouseEvent) => {\n      if (app.onClick) app.onClick(e, app);\n    },\n    [],\n  );\n\n  const handleOnKeyDownWrapper = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (onKeyDown) onKeyDown(e);\n      if (!onKeyDown && e.key === keys.ESC) {\n        close();\n      }\n    },\n    [onKeyDown, close],\n  );\n\n  const totalAppsLength = useMemo(() => apps.length + customApps.length, [apps.length, customApps.length]);\n\n  const buildRows = useCallback(\n    (appList: DSAppPickerT.AppItem[], prevIndex: number, title: string): JSX.Element => (\n      <>\n        {appList.map((app, index) => {\n          const { label, disabled, selected, icon: Icon, id } = app;\n\n          // eslint-disable-next-line react/no-unstable-nested-components\n          const IconComp = () => <Icon className=\"app-picker__icon\" size=\"m\" />;\n\n          return (\n            <StyledListItem role=\"presentation\">\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                onKeyDown={handleKeyDown}\n                data-testid={DSAppPickerDataTestIds.CHIP}\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\n                role=\"option\"\n                id={id}\n                aria-label={`${label}. ${title} (${index + prevIndex} of ${totalAppsLength})`}\n                icon={IconComp}\n                label={label}\n              />\n            </StyledListItem>\n          );\n        })}\n      </>\n    ),\n    [handleKeyDown, handleOnClick, totalAppsLength],\n  );\n\n  const AppsRows = useMemo(() => buildRows(apps, 1, sectionTitle), [apps, buildRows, sectionTitle]);\n  const CustomRows = useMemo(\n    () => buildRows(customApps, apps.length, customSectionTitle),\n    [apps.length, buildRows, customApps, customSectionTitle],\n  );\n\n  const layout = useMemo(() => {\n    const cols = ['repeat(3, 92px)'];\n    let appsRows = 0;\n    let customRows = 0;\n    const rows = [];\n    if (apps.length > 0) {\n      appsRows = apps.length / 3;\n      rows.push('68px', `repeat(${appsRows}, 68px})`);\n    }\n    if (customApps.length > 0) {\n      customRows = customApps.length / 3;\n      rows.push('9px', '68px', `repeat(${customRows}, 68px})`);\n    }\n    return {\n      rows,\n      cols,\n    };\n  }, [apps.length, customApps.length]);\n\n  // Needed just for typescript reasons\n  const convertedTypeReference = wrapperRef as unknown as React.RefObject<HTMLDivElement> &\n    React.RefObject<HTMLUListElement>;\n\n  return (\n    <StyledWrapper\n      forwardedAs=\"ul\"\n      role=\"listbox\"\n      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDownWrapper}\n      data-testid={DSAppPickerDataTestIds.WRAPPER}\n      isOverflow={isOverflow}\n      cols={layout.cols}\n      rows={layout.rows}\n      tabIndex={-1}\n      aria-label={`Application picker, ${sectionTitle} (${apps.length} apps)${\n        customApps.length > 0 ? `, ${customSectionTitle} (${customApps.length} apps)` : ''\n      }`}\n    >\n      <StyledListItemFullRow aria-hidden role=\"group\">\n        <StyledTitle data-testid={DSAppPickerDataTestIds.MAIN_TITLE} role=\"presentation\">\n          {sectionTitle}\n        </StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledSeparator role=\"presentation\" />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledTitle data-testid={DSAppPickerDataTestIds.CUSTOM_TITLE} role=\"presentation\">\n              {customSectionTitle}\n            </StyledTitle>\n          </StyledListItemFullRow>\n          {CustomRows}\n        </>\n      )}\n    </StyledWrapper>\n  );\n};\n\nexport default AppPickerImpl;\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable max-lines */\n/* eslint-disable react/no-array-index-key */\nimport React, { useCallback, useRef, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils.js';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles.js';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds } from './DSAppPickerDefinitions.js';\nimport { useFocusTrap } from '@elliemae/ds-utilities';\n\ninterface AppPickerImplProps\n  extends Omit<\n    DSAppPickerT.InternalProps,\n    'onClose' | 'icon' | 'onClick' | 'onClickOutside' | 'renderTrigger' | 'isOpen'\n  > {\n  close: () => void;\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  isOverflow: boolean;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  triggerIsInternal: boolean;\n}\n\nconst AppPickerImpl: React.ComponentType<AppPickerImplProps> = ({\n  apps,\n  customApps,\n  sectionTitle,\n  customSectionTitle,\n  close,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n  triggerIsInternal,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons({\n    wrapperRef,\n    wasOpenedByKeyboardRef,\n    actionRef,\n    triggerIsInternal,\n  });\n\n  const firstElementRef = useRef<HTMLElement | null>(null);\n  const lastElementRef = useRef<HTMLElement | null>(null);\n\n  const handleOnClick = useCallback(\n    (app: DSAppPickerT.AppItem) => (e: React.MouseEvent) => {\n      if (app.onClick) app.onClick(e, app);\n    },\n    [],\n  );\n\n  const handleOnKeyDownWrapper: React.KeyboardEventHandler = useCallback(\n    (e) => {\n      if (onKeyDown) onKeyDown(e);\n      if (!onKeyDown && e.key === keys.ESC) {\n        triggerRef?.current?.focus();\n        close();\n      }\n    },\n    [onKeyDown, triggerRef, close],\n  );\n  firstElementRef.current = allFocusableButtons[0];\n  lastElementRef.current = allFocusableButtons[allFocusableButtons.length - 1];\n\n  const handleOnKeyDown = useFocusTrap({\n    firstElementRef,\n    lastElementRef,\n    onKeyDown: handleOnKeyDownWrapper,\n  });\n\n  const totalAppsLength = useMemo(() => apps.length + customApps.length, [apps.length, customApps.length]);\n\n  const buildRows = useCallback(\n    (appList: DSAppPickerT.AppItem[], prevIndex: number, title: string): JSX.Element => (\n      <>\n        {appList.map((app, index) => {\n          const { label, disabled, selected, icon: Icon, id } = app;\n\n          // eslint-disable-next-line react/no-unstable-nested-components\n          const IconComp = () => <Icon className=\"app-picker__icon\" size=\"m\" />;\n\n          return (\n            <StyledListItem role=\"presentation\">\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                data-testid={DSAppPickerDataTestIds.CHIP}\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\n                role=\"option\"\n                id={id}\n                aria-label={`${label}. ${title} (${index + prevIndex} of ${totalAppsLength})`}\n                icon={IconComp}\n                label={label}\n              />\n            </StyledListItem>\n          );\n        })}\n      </>\n    ),\n    [handleOnClick, totalAppsLength],\n  );\n\n  const AppsRows = useMemo(() => buildRows(apps, 1, sectionTitle), [apps, buildRows, sectionTitle]);\n  const CustomRows = useMemo(\n    () => buildRows(customApps, apps.length, customSectionTitle),\n    [apps.length, buildRows, customApps, customSectionTitle],\n  );\n\n  const layout = useMemo(() => {\n    const cols = ['repeat(3, 92px)'];\n    let appsRows = 0;\n    let customRows = 0;\n    const rows = [];\n    if (apps.length > 0) {\n      appsRows = apps.length / 3;\n      rows.push('68px', `repeat(${appsRows}, 68px})`);\n    }\n    if (customApps.length > 0) {\n      customRows = customApps.length / 3;\n      rows.push('9px', '68px', `repeat(${customRows}, 68px})`);\n    }\n    return {\n      rows,\n      cols,\n    };\n  }, [apps.length, customApps.length]);\n\n  // Needed just for typescript reasons\n  const convertedTypeReference = wrapperRef as unknown as React.RefObject<HTMLDivElement> &\n    React.RefObject<HTMLUListElement>;\n\n  return (\n    <StyledWrapper\n      forwardedAs=\"ul\"\n      role=\"listbox\"\n      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDown}\n      data-testid={DSAppPickerDataTestIds.WRAPPER}\n      isOverflow={isOverflow}\n      cols={layout.cols}\n      rows={layout.rows}\n      tabIndex={-1}\n      aria-label={`Application picker, ${sectionTitle} (${apps.length} apps)${\n        customApps.length > 0 ? `, ${customSectionTitle} (${customApps.length} apps)` : ''\n      }`}\n    >\n      <StyledListItemFullRow aria-hidden role=\"group\">\n        <StyledTitle data-testid={DSAppPickerDataTestIds.MAIN_TITLE} role=\"presentation\">\n          {sectionTitle}\n        </StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledSeparator role=\"presentation\" />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledTitle data-testid={DSAppPickerDataTestIds.CUSTOM_TITLE} role=\"presentation\">\n              {customSectionTitle}\n            </StyledTitle>\n          </StyledListItemFullRow>\n          {CustomRows}\n        </>\n      )}\n    </StyledWrapper>\n  );\n};\n\nexport default AppPickerImpl;\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD6EjB;AA3EN,mBAAoD;AACpD,qBAAuB;AACvB,mBAAqB;AACrB,oBAAmG;AACnG,iCAAoC;AAEpC,oCAAuC;AACvC,0BAA6B;AAc7B,MAAM,gBAAyD,CAAC;AAAA,EAC9D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,oBAAoB,QAAI,gDAAoB;AAAA,IAClD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,sBAAkB,qBAA2B,IAAI;AACvD,QAAM,qBAAiB,qBAA2B,IAAI;AAEtD,QAAM,oBAAgB;AAAA,IACpB,CAAC,QAA8B,CAAC,MAAwB;AACtD,UAAI,IAAI;AAAS,YAAI,QAAQ,GAAG,GAAG;AAAA,IACrC;AAAA,IACA,CAAC;AAAA,EACH;AAEA,QAAM,6BAAqD;AAAA,IACzD,CAAC,MAAM;AACL,UAAI;AAAW,kBAAU,CAAC;AAC1B,UAAI,CAAC,aAAa,EAAE,QAAQ,kBAAK,KAAK;AACpC,oBAAY,SAAS,MAAM;AAC3B,cAAM;AAAA,MACR;AAAA,IACF;AAAA,IACA,CAAC,WAAW,YAAY,KAAK;AAAA,EAC/B;AACA,kBAAgB,UAAU,oBAAoB,CAAC;AAC/C,iBAAe,UAAU,oBAAoB,oBAAoB,SAAS,CAAC;AAE3E,QAAM,sBAAkB,kCAAa;AAAA,IACnC;AAAA,IACA;AAAA,IACA,WAAW;AAAA,EACb,CAAC;AAED,QAAM,sBAAkB,sBAAQ,MAAM,KAAK,SAAS,WAAW,QAAQ,CAAC,KAAK,QAAQ,WAAW,MAAM,CAAC;AAEvG,QAAM,gBAAY;AAAA,IAChB,CAAC,SAAiC,WAAmB,UACnD,2EACG,kBAAQ,IAAI,CAAC,KAAK,UAAU;AAC3B,YAAM,EAAE,OAAO,UAAU,UAAU,MAAM,MAAM,GAAG,IAAI;AAGtD,YAAM,WAAW,MAAM,4CAAC,QAAK,WAAU,oBAAmB,MAAK,KAAI;AAEnE,aACE,4CAAC,gCAAe,MAAK,gBACnB;AAAA,QAAC;AAAA;AAAA,UAEC,SAAS,cAAc,GAAG;AAAA,UAC1B,eAAa,qDAAuB;AAAA,UACpC,iBAAe;AAAA,UACf;AAAA,UACA;AAAA,UACA,iBAAe;AAAA,UACf,MAAK;AAAA,UACL;AAAA,UACA,cAAY,GAAG,UAAU,UAAU,QAAQ,gBAAgB;AAAA,UAC3D,MAAM;AAAA,UACN;AAAA;AAAA,QAXK;AAAA,MAYP,GACF;AAAA,IAEJ,CAAC,GACH;AAAA,IAEF,CAAC,eAAe,eAAe;AAAA,EACjC;AAEA,QAAM,eAAW,sBAAQ,MAAM,UAAU,MAAM,GAAG,YAAY,GAAG,CAAC,MAAM,WAAW,YAAY,CAAC;AAChG,QAAM,iBAAa;AAAA,IACjB,MAAM,UAAU,YAAY,KAAK,QAAQ,kBAAkB;AAAA,IAC3D,CAAC,KAAK,QAAQ,WAAW,YAAY,kBAAkB;AAAA,EACzD;AAEA,QAAM,aAAS,sBAAQ,MAAM;AAC3B,UAAM,OAAO,CAAC,iBAAiB;AAC/B,QAAI,WAAW;AACf,QAAI,aAAa;AACjB,UAAM,OAAO,CAAC;AACd,QAAI,KAAK,SAAS,GAAG;AACnB,iBAAW,KAAK,SAAS;AACzB,WAAK,KAAK,QAAQ,UAAU,kBAAkB;AAAA,IAChD;AACA,QAAI,WAAW,SAAS,GAAG;AACzB,mBAAa,WAAW,SAAS;AACjC,WAAK,KAAK,OAAO,QAAQ,UAAU,oBAAoB;AAAA,IACzD;AACA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,GAAG,CAAC,KAAK,QAAQ,WAAW,MAAM,CAAC;AAGnC,QAAM,yBAAyB;AAG/B,SACE;AAAA,IAAC;AAAA;AAAA,MACC,aAAY;AAAA,MACZ,MAAK;AAAA,MACL,KAAK;AAAA,MACL,WAAW;AAAA,MACX,eAAa,qDAAuB;AAAA,MACpC;AAAA,MACA,MAAM,OAAO;AAAA,MACb,MAAM,OAAO;AAAA,MACb,UAAU;AAAA,MACV,cAAY,uBAAuB,iBAAiB,KAAK,eACvD,WAAW,SAAS,IAAI,KAAK,uBAAuB,WAAW,iBAAiB;AAAA,MAGlF;AAAA,oDAAC,uCAAsB,eAAW,MAAC,MAAK,SACtC,sDAAC,6BAAY,eAAa,qDAAuB,YAAY,MAAK,gBAC/D,wBACH,GACF;AAAA,QACC;AAAA,QACA,WAAW,SAAS,KACnB,4EACE;AAAA,sDAAC,uCAAsB,eAAW,MAAC,MAAK,SACtC,sDAAC,iCAAgB,MAAK,gBAAe,GACvC;AAAA,UACA,4CAAC,uCAAsB,eAAW,MAAC,MAAK,SACtC,sDAAC,6BAAY,eAAa,qDAAuB,cAAc,MAAK,gBACjE,8BACH,GACF;AAAA,UACC;AAAA,WACH;AAAA;AAAA;AAAA,EAEJ;AAEJ;AAEA,IAAO,wBAAQ;",
   "names": []
 }

package/dist/cjs/DSAppPicker.js

@@ -129,24 +129,27 @@ const DSAppPicker = (props) => {
       triggerRef
     ]
   );
-  const RenderTrigger = renderTrigger || (({ ref }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    import_ds_button_v2.DSButtonV2,
-    {
-      "data-testid": import_DSAppPickerDefinitions.DSAppPickerDataTestIds.TRIGGER,
-      id: "app-picker__button",
-      buttonType: "icon",
-      "aria-haspopup": "true",
-      "aria-expanded": isOpen ?? open,
-      "aria-label": "Application picker",
-      innerRef: (0, import_ds_utilities.mergeRefs)(ref, defaultTriggerRef),
-      onClick: (e) => {
-        wasOpenedByKeyboardRef.current = e.detail === 0;
-        onClick?.(e);
-        setOpen(true);
-      },
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Icon, {})
-    }
-  ));
+  const RenderTrigger = (0, import_react.useMemo)(
+    () => renderTrigger || (({ ref }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      import_ds_button_v2.DSButtonV2,
+      {
+        "data-testid": import_DSAppPickerDefinitions.DSAppPickerDataTestIds.TRIGGER,
+        id: "app-picker__button",
+        buttonType: "icon",
+        "aria-haspopup": "true",
+        "aria-expanded": isOpen ?? open,
+        "aria-label": "Application picker",
+        innerRef: (0, import_ds_utilities.mergeRefs)(ref, triggerRef || defaultTriggerRef),
+        onClick: (e) => {
+          wasOpenedByKeyboardRef.current = e.detail === 0;
+          onClick?.(e);
+          setOpen(true);
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Icon, {})
+      }
+    )),
+    [Icon, isOpen, onClick, open, renderTrigger, triggerRef]
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_ds_popover.default,
     {

package/dist/cjs/DSAppPicker.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/DSAppPicker.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useState, useEffect, useRef, useCallback } from 'react';\nimport { DSButtonV2 } from '@elliemae/ds-button-v2';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport { describe, useMemoMergePropsWithDefault } from '@elliemae/ds-props-helpers';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerPropTypes, defaultProps } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds, DSAppPickerName } from './DSAppPickerDefinitions.js';\n\nconst DSAppPicker: React.ComponentType<DSAppPickerT.Props> = (props) => {\n  const propsWithDefault = useMemoMergePropsWithDefault<DSAppPickerT.InternalProps>(props, defaultProps);\n\n  const {\n    apps,\n    customApps,\n    sectionTitle,\n    customSectionTitle,\n    icon: Icon,\n    renderTrigger,\n    isOpen,\n    onClose,\n    actionRef,\n    onKeyDown,\n    onClick,\n    onClickOutside,\n    triggerRef,\n  } = propsWithDefault;\n\n  const [open, setOpen] = useState(false);\n  const [isOverflow, setIsOverflow] = useState(false);\n  const wrapperRef = useRef<HTMLDivElement>(null);\n  const defaultTriggerRef = useRef(null);\n  const wasOpenedByKeyboardRef = useRef(false);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusToIndex = (index: number) => {\n        if (wrapperRef.current) {\n          const parent = wrapperRef.current;\n          const buttons = [...parent.querySelectorAll('button')];\n          buttons[index].focus();\n        }\n      };\n      actionRef.current.focusWrapper = () => {\n        wrapperRef.current?.focus();\n      };\n    }\n  }, [actionRef, apps, customApps]);\n\n  useEffect(() => {\n    setTimeout(() => {\n      if (wrapperRef.current) {\n        const { scrollHeight, clientHeight } = wrapperRef.current;\n        if (scrollHeight > clientHeight) return setIsOverflow(true);\n      }\n      return setIsOverflow(false);\n    });\n  }, [isOpen, open]);\n\n  const handleOnClose = useCallback(() => {\n    setOpen(false);\n    onClose?.();\n  }, [onClose]);\n\n  const handleOnClickOutside = (e: React.MouseEvent) => {\n    setOpen(false);\n    onClose?.();\n    onClickOutside?.(e);\n  };\n\n  const AppPickerContent = useCallback(\n    () => (\n      <AppPickerImpl\n        apps={apps}\n        customApps={customApps}\n        sectionTitle={sectionTitle}\n        customSectionTitle={customSectionTitle}\n        close={handleOnClose}\n        wrapperRef={wrapperRef}\n        onKeyDown={onKeyDown}\n        triggerRef={triggerRef || defaultTriggerRef}\n        actionRef={actionRef}\n        triggerIsInternal={!renderTrigger}\n        wasOpenedByKeyboardRef={wasOpenedByKeyboardRef}\n        isOverflow={isOverflow}\n      />\n    ),\n    [\n      actionRef,\n      apps,\n      customApps,\n      customSectionTitle,\n      handleOnClose,\n      isOverflow,\n      onKeyDown,\n      renderTrigger,\n      sectionTitle,\n      triggerRef,\n    ],\n  );\n\n  const RenderTrigger =\n    renderTrigger ||\n    (({ ref }: { ref: React.RefObject<HTMLButtonElement> }) => (\n      <DSButtonV2\n        data-testid={DSAppPickerDataTestIds.TRIGGER}\n        id=\"app-picker__button\"\n        buttonType=\"icon\"\n        aria-haspopup=\"true\"\n        aria-expanded={isOpen ?? open}\n        aria-label=\"Application picker\"\n        innerRef={mergeRefs(ref, defaultTriggerRef)}\n        onClick={(e: React.MouseEvent | React.KeyboardEvent) => {\n          wasOpenedByKeyboardRef.current = e.detail === 0;\n          onClick?.(e);\n          setOpen(true);\n        }}\n      >\n        <Icon />\n      </DSButtonV2>\n    ));\n\n  return (\n    <DSPopover\n      content={<AppPickerContent />}\n      isOpen={typeof isOpen === 'boolean' ? isOpen : open}\n      onClickOutside={handleOnClickOutside}\n      placement=\"bottom\"\n      interactionType=\"click\"\n      renderTrigger={RenderTrigger}\n      showArrow\n      style={{\n        padding: '0',\n        maxWidth: '1000px',\n        width: 'fit-content',\n      }}\n    />\n  );\n};\n\nDSAppPicker.displayName = DSAppPickerName;\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = DSAppPickerPropTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": "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",
+  "sourcesContent": ["import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';\nimport { DSButtonV2 } from '@elliemae/ds-button-v2';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport { describe, useMemoMergePropsWithDefault } from '@elliemae/ds-props-helpers';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerPropTypes, defaultProps } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds, DSAppPickerName } from './DSAppPickerDefinitions.js';\n\nconst DSAppPicker: React.ComponentType<DSAppPickerT.Props> = (props) => {\n  const propsWithDefault = useMemoMergePropsWithDefault<DSAppPickerT.InternalProps>(props, defaultProps);\n\n  const {\n    apps,\n    customApps,\n    sectionTitle,\n    customSectionTitle,\n    icon: Icon,\n    renderTrigger,\n    isOpen,\n    onClose,\n    actionRef,\n    onKeyDown,\n    onClick,\n    onClickOutside,\n    triggerRef,\n  } = propsWithDefault;\n\n  const [open, setOpen] = useState(false);\n  const [isOverflow, setIsOverflow] = useState(false);\n  const wrapperRef = useRef<HTMLDivElement>(null);\n  const defaultTriggerRef = useRef(null);\n  const wasOpenedByKeyboardRef = useRef(false);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusToIndex = (index: number) => {\n        if (wrapperRef.current) {\n          const parent = wrapperRef.current;\n          const buttons = [...parent.querySelectorAll('button')];\n          buttons[index].focus();\n        }\n      };\n      actionRef.current.focusWrapper = () => {\n        wrapperRef.current?.focus();\n      };\n    }\n  }, [actionRef, apps, customApps]);\n\n  useEffect(() => {\n    setTimeout(() => {\n      if (wrapperRef.current) {\n        const { scrollHeight, clientHeight } = wrapperRef.current;\n        if (scrollHeight > clientHeight) return setIsOverflow(true);\n      }\n      return setIsOverflow(false);\n    });\n  }, [isOpen, open]);\n\n  const handleOnClose = useCallback(() => {\n    setOpen(false);\n    onClose?.();\n  }, [onClose]);\n\n  const handleOnClickOutside = (e: React.MouseEvent) => {\n    setOpen(false);\n    onClose?.();\n    onClickOutside?.(e);\n  };\n\n  const AppPickerContent = useCallback(\n    () => (\n      <AppPickerImpl\n        apps={apps}\n        customApps={customApps}\n        sectionTitle={sectionTitle}\n        customSectionTitle={customSectionTitle}\n        close={handleOnClose}\n        wrapperRef={wrapperRef}\n        onKeyDown={onKeyDown}\n        triggerRef={triggerRef || defaultTriggerRef}\n        actionRef={actionRef}\n        triggerIsInternal={!renderTrigger}\n        wasOpenedByKeyboardRef={wasOpenedByKeyboardRef}\n        isOverflow={isOverflow}\n      />\n    ),\n    [\n      actionRef,\n      apps,\n      customApps,\n      customSectionTitle,\n      handleOnClose,\n      isOverflow,\n      onKeyDown,\n      renderTrigger,\n      sectionTitle,\n      triggerRef,\n    ],\n  );\n\n  const RenderTrigger = useMemo(\n    () =>\n      renderTrigger ||\n      (({ ref }: { ref: React.RefObject<HTMLButtonElement> }) => (\n        <DSButtonV2\n          data-testid={DSAppPickerDataTestIds.TRIGGER}\n          id=\"app-picker__button\"\n          buttonType=\"icon\"\n          aria-haspopup=\"true\"\n          aria-expanded={isOpen ?? open}\n          aria-label=\"Application picker\"\n          innerRef={mergeRefs(ref, triggerRef || defaultTriggerRef)}\n          onClick={(e: React.MouseEvent | React.KeyboardEvent) => {\n            wasOpenedByKeyboardRef.current = e.detail === 0;\n            onClick?.(e);\n            setOpen(true);\n          }}\n        >\n          <Icon />\n        </DSButtonV2>\n      )),\n    [Icon, isOpen, onClick, open, renderTrigger, triggerRef],\n  );\n\n  return (\n    <DSPopover\n      content={<AppPickerContent />}\n      isOpen={typeof isOpen === 'boolean' ? isOpen : open}\n      onClickOutside={handleOnClickOutside}\n      placement=\"bottom\"\n      interactionType=\"click\"\n      renderTrigger={RenderTrigger}\n      showArrow\n      style={{\n        padding: '0',\n        maxWidth: '1000px',\n        width: 'fit-content',\n      }}\n    />\n  );\n};\n\nDSAppPicker.displayName = DSAppPickerName;\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = DSAppPickerPropTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADyEjB;AAzEN,mBAAyE;AACzE,0BAA2B;AAC3B,0BAA0B;AAC1B,8BAAuD;AACvD,wBAAsB;AACtB,2BAA0B;AAE1B,mCAAmD;AACnD,oCAAwD;AAExD,MAAM,cAAuD,CAAC,UAAU;AACtE,QAAM,uBAAmB,sDAAyD,OAAO,yCAAY;AAErG,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,QAAM,CAAC,MAAM,OAAO,QAAI,uBAAS,KAAK;AACtC,QAAM,CAAC,YAAY,aAAa,QAAI,uBAAS,KAAK;AAClD,QAAM,iBAAa,qBAAuB,IAAI;AAC9C,QAAM,wBAAoB,qBAAO,IAAI;AACrC,QAAM,6BAAyB,qBAAO,KAAK;AAE3C,8BAAU,MAAM;AACd,QAAI,aAAa,UAAU,SAAS;AAClC,gBAAU,QAAQ,eAAe,CAAC,UAAkB;AAClD,YAAI,WAAW,SAAS;AACtB,gBAAM,SAAS,WAAW;AAC1B,gBAAM,UAAU,CAAC,GAAG,OAAO,iBAAiB,QAAQ,CAAC;AACrD,kBAAQ,KAAK,EAAE,MAAM;AAAA,QACvB;AAAA,MACF;AACA,gBAAU,QAAQ,eAAe,MAAM;AACrC,mBAAW,SAAS,MAAM;AAAA,MAC5B;AAAA,IACF;AAAA,EACF,GAAG,CAAC,WAAW,MAAM,UAAU,CAAC;AAEhC,8BAAU,MAAM;AACd,eAAW,MAAM;AACf,UAAI,WAAW,SAAS;AACtB,cAAM,EAAE,cAAc,aAAa,IAAI,WAAW;AAClD,YAAI,eAAe;AAAc,iBAAO,cAAc,IAAI;AAAA,MAC5D;AACA,aAAO,cAAc,KAAK;AAAA,IAC5B,CAAC;AAAA,EACH,GAAG,CAAC,QAAQ,IAAI,CAAC;AAEjB,QAAM,oBAAgB,0BAAY,MAAM;AACtC,YAAQ,KAAK;AACb,cAAU;AAAA,EACZ,GAAG,CAAC,OAAO,CAAC;AAEZ,QAAM,uBAAuB,CAAC,MAAwB;AACpD,YAAQ,KAAK;AACb,cAAU;AACV,qBAAiB,CAAC;AAAA,EACpB;AAEA,QAAM,uBAAmB;AAAA,IACvB,MACE;AAAA,MAAC,qBAAAA;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA;AAAA,QACA,YAAY,cAAc;AAAA,QAC1B;AAAA,QACA,mBAAmB,CAAC;AAAA,QACpB;AAAA,QACA;AAAA;AAAA,IACF;AAAA,IAEF;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,QAAM,oBAAgB;AAAA,IACpB,MACE,kBACC,CAAC,EAAE,IAAI,MACN;AAAA,MAAC;AAAA;AAAA,QACC,eAAa,qDAAuB;AAAA,QACpC,IAAG;AAAA,QACH,YAAW;AAAA,QACX,iBAAc;AAAA,QACd,iBAAe,UAAU;AAAA,QACzB,cAAW;AAAA,QACX,cAAU,+BAAU,KAAK,cAAc,iBAAiB;AAAA,QACxD,SAAS,CAAC,MAA8C;AACtD,iCAAuB,UAAU,EAAE,WAAW;AAC9C,oBAAU,CAAC;AACX,kBAAQ,IAAI;AAAA,QACd;AAAA,QAEA,sDAAC,QAAK;AAAA;AAAA,IACR;AAAA,IAEJ,CAAC,MAAM,QAAQ,SAAS,MAAM,eAAe,UAAU;AAAA,EACzD;AAEA,SACE;AAAA,IAAC,kBAAAC;AAAA,IAAA;AAAA,MACC,SAAS,4CAAC,oBAAiB;AAAA,MAC3B,QAAQ,OAAO,WAAW,YAAY,SAAS;AAAA,MAC/C,gBAAgB;AAAA,MAChB,WAAU;AAAA,MACV,iBAAgB;AAAA,MAChB,eAAe;AAAA,MACf,WAAS;AAAA,MACT,OAAO;AAAA,QACL,SAAS;AAAA,QACT,UAAU;AAAA,QACV,OAAO;AAAA,MACT;AAAA;AAAA,EACF;AAEJ;AAEA,YAAY,cAAc;AAC1B,MAAM,0BAAsB,kCAAS,WAAW;AAChD,oBAAoB,YAAY;AAGhC,IAAO,sBAAQ;",
   "names": ["AppPickerImpl", "DSPopover"]
 }

package/dist/cjs/hooks/useKeepTrackButtons.js

@@ -40,30 +40,31 @@ const useKeepTrackButtons = ({
   actionRef,
   triggerIsInternal
 }) => {
-  const allFocusableButtons = (0, import_react.useRef)([]);
+  const [allFocusableButtons, setAllFocusableButtons] = (0, import_react.useState)([]);
   const selectedButton = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     if (actionRef && actionRef.current) {
-      actionRef.current.focusSelectedOrFirstAvailable = () => setTimeout(() => (0, import_utils.focusSelectedOrFirstAvailable)(wrapperRef, allFocusableButtons, selectedButton));
+      actionRef.current.focusSelectedOrFirstAvailable = () => setTimeout(() => {
+        (0, import_utils.focusSelectedOrFirstAvailable)(wrapperRef, allFocusableButtons, selectedButton);
+      });
     }
-  }, [actionRef, wrapperRef]);
+  }, [actionRef, allFocusableButtons, wrapperRef]);
   (0, import_react.useEffect)(() => {
-    setTimeout(() => {
-      wrapperRef?.current?.querySelectorAll("button").forEach((e, index) => {
-        if (!e.hasAttribute("disabled")) {
-          allFocusableButtons?.current?.push(e);
-        }
-        if (e.getAttribute("aria-selected") === "true") {
-          selectedButton.current = index;
-        }
-        if (wasOpenedByKeyboardRef.current || !triggerIsInternal) {
-          (0, import_utils.focusSelectedOrFirstAvailable)(wrapperRef, allFocusableButtons, selectedButton);
-        } else {
-          wrapperRef.current?.focus();
-        }
-      });
+    wrapperRef?.current?.querySelectorAll("button").forEach((e, index) => {
+      if (!e.hasAttribute("disabled"))
+        setAllFocusableButtons((prev) => [...prev, e]);
+      if (e.getAttribute("aria-selected") === "true") {
+        selectedButton.current = index;
+      }
     });
   }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);
+  (0, import_react.useEffect)(() => {
+    if (wasOpenedByKeyboardRef?.current || !triggerIsInternal) {
+      (0, import_utils.focusSelectedOrFirstAvailable)(wrapperRef, allFocusableButtons, selectedButton);
+    } else {
+      wrapperRef.current?.focus();
+    }
+  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal, allFocusableButtons]);
   return { allFocusableButtons, selectedButton };
 };
 //# sourceMappingURL=useKeepTrackButtons.js.map

package/dist/cjs/hooks/useKeepTrackButtons.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useKeepTrackButtons.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import type React from 'react';\nimport { useEffect, useRef } from 'react';\nimport type { DSAppPickerT } from '../react-desc-prop-types.js';\nimport { focusSelectedOrFirstAvailable } from '../utils.js';\n\ninterface UseKeepTrackButtonsT {\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  actionRef?: DSAppPickerT.ActionRef;\n  triggerIsInternal?: boolean;\n}\n\nexport const useKeepTrackButtons = ({\n  wrapperRef,\n  wasOpenedByKeyboardRef,\n  actionRef,\n  triggerIsInternal,\n}: UseKeepTrackButtonsT) => {\n  const allFocusableButtons = useRef<HTMLButtonElement[]>([]);\n  const selectedButton = useRef<number | null>(null);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusSelectedOrFirstAvailable = () =>\n        setTimeout(() => focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton));\n    }\n  }, [actionRef, wrapperRef]);\n\n  useEffect(() => {\n    setTimeout(() => {\n      wrapperRef?.current?.querySelectorAll('button').forEach((e, index) => {\n        if (!e.hasAttribute('disabled')) {\n          allFocusableButtons?.current?.push(e);\n        }\n        if (e.getAttribute('aria-selected') === 'true') {\n          selectedButton.current = index;\n        }\n        if (wasOpenedByKeyboardRef.current || !triggerIsInternal) {\n          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n        } else {\n          wrapperRef.current?.focus();\n        }\n      });\n    });\n  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);\n\n  return { allFocusableButtons, selectedButton };\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADCvB,mBAAkC;AAElC,mBAA8C;AASvC,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA4B;AAC1B,QAAM,0BAAsB,qBAA4B,CAAC,CAAC;AAC1D,QAAM,qBAAiB,qBAAsB,IAAI;AAEjD,8BAAU,MAAM;AACd,QAAI,aAAa,UAAU,SAAS;AAClC,gBAAU,QAAQ,gCAAgC,MAChD,WAAW,UAAM,4CAA8B,YAAY,qBAAqB,cAAc,CAAC;AAAA,IACnG;AAAA,EACF,GAAG,CAAC,WAAW,UAAU,CAAC;AAE1B,8BAAU,MAAM;AACd,eAAW,MAAM;AACf,kBAAY,SAAS,iBAAiB,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU;AACpE,YAAI,CAAC,EAAE,aAAa,UAAU,GAAG;AAC/B,+BAAqB,SAAS,KAAK,CAAC;AAAA,QACtC;AACA,YAAI,EAAE,aAAa,eAAe,MAAM,QAAQ;AAC9C,yBAAe,UAAU;AAAA,QAC3B;AACA,YAAI,uBAAuB,WAAW,CAAC,mBAAmB;AACxD,0DAA8B,YAAY,qBAAqB,cAAc;AAAA,QAC/E,OAAO;AACL,qBAAW,SAAS,MAAM;AAAA,QAC5B;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH,GAAG,CAAC,wBAAwB,YAAY,iBAAiB,CAAC;AAE1D,SAAO,EAAE,qBAAqB,eAAe;AAC/C;",
+  "sourcesContent": ["import type React from 'react';\nimport { useEffect, useRef, useState } from 'react';\nimport type { DSAppPickerT } from '../react-desc-prop-types.js';\nimport { focusSelectedOrFirstAvailable } from '../utils.js';\n\ninterface UseKeepTrackButtonsT {\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  actionRef?: DSAppPickerT.ActionRef;\n  triggerIsInternal?: boolean;\n}\n\nexport const useKeepTrackButtons = ({\n  wrapperRef,\n  wasOpenedByKeyboardRef,\n  actionRef,\n  triggerIsInternal,\n}: UseKeepTrackButtonsT) => {\n  const [allFocusableButtons, setAllFocusableButtons] = useState<HTMLButtonElement[]>([]);\n  const selectedButton = useRef<number | null>(null);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusSelectedOrFirstAvailable = () =>\n        setTimeout(() => {\n          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n        });\n    }\n  }, [actionRef, allFocusableButtons, wrapperRef]);\n\n  useEffect(() => {\n    wrapperRef?.current?.querySelectorAll('button').forEach((e, index) => {\n      if (!e.hasAttribute('disabled')) setAllFocusableButtons((prev) => [...prev, e]);\n      if (e.getAttribute('aria-selected') === 'true') {\n        selectedButton.current = index;\n      }\n    });\n  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);\n\n  useEffect(() => {\n    if (wasOpenedByKeyboardRef?.current || !triggerIsInternal) {\n      focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n    } else {\n      wrapperRef.current?.focus();\n    }\n  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal, allFocusableButtons]);\n\n  return { allFocusableButtons, selectedButton };\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADCvB,mBAA4C;AAE5C,mBAA8C;AASvC,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA4B;AAC1B,QAAM,CAAC,qBAAqB,sBAAsB,QAAI,uBAA8B,CAAC,CAAC;AACtF,QAAM,qBAAiB,qBAAsB,IAAI;AAEjD,8BAAU,MAAM;AACd,QAAI,aAAa,UAAU,SAAS;AAClC,gBAAU,QAAQ,gCAAgC,MAChD,WAAW,MAAM;AACf,wDAA8B,YAAY,qBAAqB,cAAc;AAAA,MAC/E,CAAC;AAAA,IACL;AAAA,EACF,GAAG,CAAC,WAAW,qBAAqB,UAAU,CAAC;AAE/C,8BAAU,MAAM;AACd,gBAAY,SAAS,iBAAiB,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU;AACpE,UAAI,CAAC,EAAE,aAAa,UAAU;AAAG,+BAAuB,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC;AAC9E,UAAI,EAAE,aAAa,eAAe,MAAM,QAAQ;AAC9C,uBAAe,UAAU;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,GAAG,CAAC,wBAAwB,YAAY,iBAAiB,CAAC;AAE1D,8BAAU,MAAM;AACd,QAAI,wBAAwB,WAAW,CAAC,mBAAmB;AACzD,sDAA8B,YAAY,qBAAqB,cAAc;AAAA,IAC/E,OAAO;AACL,iBAAW,SAAS,MAAM;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,wBAAwB,YAAY,mBAAmB,mBAAmB,CAAC;AAE/E,SAAO,EAAE,qBAAqB,eAAe;AAC/C;",
   "names": []
 }

package/dist/cjs/react-desc-prop-types.js

@@ -61,6 +61,9 @@ const DSAppPickerPropTypes = {
   onClose: import_ds_props_helpers.PropTypes.func.description("Callback function when the AppPicker closes"),
   onKeyDown: import_ds_props_helpers.PropTypes.func.description("OnKeyDown handler callback."),
   onClick: import_ds_props_helpers.PropTypes.func.description("Custom onClick for Trigger component."),
-  onClickOutside: import_ds_props_helpers.PropTypes.func.description("Callback event when the user clicks outside the App Picker.")
+  onClickOutside: import_ds_props_helpers.PropTypes.func.description("Callback event when the user clicks outside the App Picker."),
+  triggerRef: import_ds_props_helpers.PropTypes.oneOfType([import_ds_props_helpers.PropTypes.func, import_ds_props_helpers.PropTypes.shape({ current: import_ds_props_helpers.PropTypes.any })]).description(
+    "Ref to the trigger button."
+  )
 };
 //# sourceMappingURL=react-desc-prop-types.js.map

package/dist/cjs/react-desc-prop-types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/react-desc-prop-types.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React from 'react';\nimport type { WeakValidationMap } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport type { SvgIconT } from '@elliemae/ds-icons';\nimport type { GlobalAttributesT, XstyledProps } from '@elliemae/ds-props-helpers';\nimport { PropTypes } from '@elliemae/ds-props-helpers';\n\nexport declare namespace DSAppPickerT {\n  export interface AppItem {\n    label: string;\n    icon: React.ComponentType<{ className: string; size: string }>;\n    onClick?: (e: React.MouseEvent, item: AppItem) => void | null;\n    disabled?: boolean;\n    id?: string;\n    selected?: boolean;\n  }\n\n  export type ActionRef = React.MutableRefObject<{\n    focusToIndex?: (index: number) => void;\n    focusSelectedOrFirstAvailable?: () => void;\n    focusWrapper: () => void;\n  }>;\n\n  export interface DefaultProps {\n    apps: AppItem[];\n    customApps: AppItem[];\n    sectionTitle: string;\n    customSectionTitle: string;\n    icon: React.ComponentType<SvgIconT.Props>;\n  }\n\n  export interface OptionalProps {\n    onClose?: () => void;\n    onClick?: (e: React.MouseEvent | React.KeyboardEvent) => void;\n    onClickOutside?: (e: React.MouseEvent) => void;\n    onKeyDown?: (e: React.KeyboardEvent) => void;\n    actionRef?: ActionRef;\n    renderTrigger?: React.ComponentType<Record<string, unknown>>;\n    isOpen?: boolean;\n    triggerRef?: React.RefObject<HTMLButtonElement>;\n  }\n\n  export interface Props\n    extends Partial<DefaultProps>,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n\n  export interface InternalProps\n    extends DefaultProps,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n}\n\nexport const defaultProps: DSAppPickerT.DefaultProps = {\n  apps: [],\n  customApps: [],\n  sectionTitle: 'APPLICATIONS',\n  customSectionTitle: 'CUSTOM APPLICATIONS',\n  icon: () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n};\n\n// =============================================================================\n// PropTypes\n// =============================================================================\n\nexport const DSAppPickerPropTypes = {\n  apps: PropTypes.array.description(\n    'Main items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ).isRequired,\n  customApps: PropTypes.array.description(\n    'Custom items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ),\n  sectionTitle: PropTypes.string.description('main section title').defaultValue('APPLICATIONS'),\n  customSectionTitle: PropTypes.string.description('custom section title').defaultValue('CUSTOM APPLICATIONS'),\n  icon: PropTypes.func.description('trigger button s icon').defaultValue(MenuPicker),\n  renderTrigger: PropTypes.func.description('Custom trigger component.'),\n  actionRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(\n    'Ref containing a focusToIndex method. This method allows you to focus any App inside the AppPicker.',\n  ),\n  isOpen: PropTypes.bool.description('Wether the AppPicker should be open or not.'),\n  onClose: PropTypes.func.description('Callback function when the AppPicker closes'),\n  onKeyDown: PropTypes.func.description('OnKeyDown handler callback.'),\n  onClick: PropTypes.func.description('Custom onClick for Trigger component.'),\n  onClickOutside: PropTypes.func.description('Callback event when the user clicks outside the App Picker.'),\n} as WeakValidationMap<unknown>;\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD4DT;AA1Dd,sBAA2B;AAG3B,8BAA0B;AAkDnB,MAAM,eAA0C;AAAA,EACrD,MAAM,CAAC;AAAA,EACP,YAAY,CAAC;AAAA,EACb,cAAc;AAAA,EACd,oBAAoB;AAAA,EACpB,MAAM,MAAM,4CAAC,8BAAW,OAAO,CAAC,iBAAiB,KAAK,GAAG,MAAK,KAAI;AACpE;AAMO,MAAM,uBAAuB;AAAA,EAClC,MAAM,kCAAU,MAAM;AAAA,IACpB;AAAA,EACF,EAAE;AAAA,EACF,YAAY,kCAAU,MAAM;AAAA,IAC1B;AAAA,EACF;AAAA,EACA,cAAc,kCAAU,OAAO,YAAY,oBAAoB,EAAE,aAAa,cAAc;AAAA,EAC5F,oBAAoB,kCAAU,OAAO,YAAY,sBAAsB,EAAE,aAAa,qBAAqB;AAAA,EAC3G,MAAM,kCAAU,KAAK,YAAY,uBAAuB,EAAE,aAAa,0BAAU;AAAA,EACjF,eAAe,kCAAU,KAAK,YAAY,2BAA2B;AAAA,EACrE,WAAW,kCAAU,UAAU,CAAC,kCAAU,MAAM,kCAAU,MAAM,EAAE,SAAS,kCAAU,IAAI,CAAC,CAAC,CAAC,EAAE;AAAA,IAC5F;AAAA,EACF;AAAA,EACA,QAAQ,kCAAU,KAAK,YAAY,6CAA6C;AAAA,EAChF,SAAS,kCAAU,KAAK,YAAY,6CAA6C;AAAA,EACjF,WAAW,kCAAU,KAAK,YAAY,6BAA6B;AAAA,EACnE,SAAS,kCAAU,KAAK,YAAY,uCAAuC;AAAA,EAC3E,gBAAgB,kCAAU,KAAK,YAAY,6DAA6D;AAC1G;",
+  "sourcesContent": ["import React from 'react';\nimport type { WeakValidationMap } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport type { SvgIconT } from '@elliemae/ds-icons';\nimport type { GlobalAttributesT, XstyledProps } from '@elliemae/ds-props-helpers';\nimport { PropTypes } from '@elliemae/ds-props-helpers';\n\nexport declare namespace DSAppPickerT {\n  export interface AppItem {\n    label: string;\n    icon: React.ComponentType<{ className: string; size: string }>;\n    onClick?: (e: React.MouseEvent, item: AppItem) => void | null;\n    disabled?: boolean;\n    id?: string;\n    selected?: boolean;\n  }\n\n  export type ActionRef = React.MutableRefObject<{\n    focusToIndex?: (index: number) => void;\n    focusSelectedOrFirstAvailable?: () => void;\n    focusWrapper: () => void;\n  }>;\n\n  export interface DefaultProps {\n    apps: AppItem[];\n    customApps: AppItem[];\n    sectionTitle: string;\n    customSectionTitle: string;\n    icon: React.ComponentType<SvgIconT.Props>;\n  }\n\n  export interface OptionalProps {\n    onClose?: () => void;\n    onClick?: (e: React.MouseEvent | React.KeyboardEvent) => void;\n    onClickOutside?: (e: React.MouseEvent) => void;\n    onKeyDown?: (e: React.KeyboardEvent) => void;\n    actionRef?: ActionRef;\n    renderTrigger?: React.ComponentType<Record<string, unknown>>;\n    isOpen?: boolean;\n    triggerRef?: React.RefObject<HTMLButtonElement>;\n  }\n\n  export interface Props\n    extends Partial<DefaultProps>,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n\n  export interface InternalProps\n    extends DefaultProps,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n}\n\nexport const defaultProps: DSAppPickerT.DefaultProps = {\n  apps: [],\n  customApps: [],\n  sectionTitle: 'APPLICATIONS',\n  customSectionTitle: 'CUSTOM APPLICATIONS',\n  icon: () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n};\n\n// =============================================================================\n// PropTypes\n// =============================================================================\n\nexport const DSAppPickerPropTypes = {\n  apps: PropTypes.array.description(\n    'Main items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ).isRequired,\n  customApps: PropTypes.array.description(\n    'Custom items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ),\n  sectionTitle: PropTypes.string.description('main section title').defaultValue('APPLICATIONS'),\n  customSectionTitle: PropTypes.string.description('custom section title').defaultValue('CUSTOM APPLICATIONS'),\n  icon: PropTypes.func.description('trigger button s icon').defaultValue(MenuPicker),\n  renderTrigger: PropTypes.func.description('Custom trigger component.'),\n  actionRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(\n    'Ref containing a focusToIndex method. This method allows you to focus any App inside the AppPicker.',\n  ),\n  isOpen: PropTypes.bool.description('Wether the AppPicker should be open or not.'),\n  onClose: PropTypes.func.description('Callback function when the AppPicker closes'),\n  onKeyDown: PropTypes.func.description('OnKeyDown handler callback.'),\n  onClick: PropTypes.func.description('Custom onClick for Trigger component.'),\n  onClickOutside: PropTypes.func.description('Callback event when the user clicks outside the App Picker.'),\n  triggerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(\n    'Ref to the trigger button.',\n  ),\n} as WeakValidationMap<unknown>;\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD4DT;AA1Dd,sBAA2B;AAG3B,8BAA0B;AAkDnB,MAAM,eAA0C;AAAA,EACrD,MAAM,CAAC;AAAA,EACP,YAAY,CAAC;AAAA,EACb,cAAc;AAAA,EACd,oBAAoB;AAAA,EACpB,MAAM,MAAM,4CAAC,8BAAW,OAAO,CAAC,iBAAiB,KAAK,GAAG,MAAK,KAAI;AACpE;AAMO,MAAM,uBAAuB;AAAA,EAClC,MAAM,kCAAU,MAAM;AAAA,IACpB;AAAA,EACF,EAAE;AAAA,EACF,YAAY,kCAAU,MAAM;AAAA,IAC1B;AAAA,EACF;AAAA,EACA,cAAc,kCAAU,OAAO,YAAY,oBAAoB,EAAE,aAAa,cAAc;AAAA,EAC5F,oBAAoB,kCAAU,OAAO,YAAY,sBAAsB,EAAE,aAAa,qBAAqB;AAAA,EAC3G,MAAM,kCAAU,KAAK,YAAY,uBAAuB,EAAE,aAAa,0BAAU;AAAA,EACjF,eAAe,kCAAU,KAAK,YAAY,2BAA2B;AAAA,EACrE,WAAW,kCAAU,UAAU,CAAC,kCAAU,MAAM,kCAAU,MAAM,EAAE,SAAS,kCAAU,IAAI,CAAC,CAAC,CAAC,EAAE;AAAA,IAC5F;AAAA,EACF;AAAA,EACA,QAAQ,kCAAU,KAAK,YAAY,6CAA6C;AAAA,EAChF,SAAS,kCAAU,KAAK,YAAY,6CAA6C;AAAA,EACjF,WAAW,kCAAU,KAAK,YAAY,6BAA6B;AAAA,EACnE,SAAS,kCAAU,KAAK,YAAY,uCAAuC;AAAA,EAC3E,gBAAgB,kCAAU,KAAK,YAAY,6DAA6D;AAAA,EACxG,YAAY,kCAAU,UAAU,CAAC,kCAAU,MAAM,kCAAU,MAAM,EAAE,SAAS,kCAAU,IAAI,CAAC,CAAC,CAAC,EAAE;AAAA,IAC7F;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/cjs/utils.js

@@ -49,7 +49,7 @@ const focusSelectedOrFirstAvailable = (wrapperRef, allFocusableButtonsRef, selec
   if (selectedButtonRef.current !== null) {
     wrapperRef?.current?.querySelectorAll("button")[selectedButtonRef.current].focus();
   } else {
-    allFocusableButtonsRef?.current[0]?.focus();
+    allFocusableButtonsRef?.[0]?.focus();
   }
 };
 //# sourceMappingURL=utils.js.map

package/dist/cjs/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import type React from 'react';\n\nexport const keys = {\n  LEFT: 'ArrowLeft',\n  UP: 'ArrowUp',\n  RIGHT: 'ArrowRight',\n  DOWN: 'ArrowDown',\n  ENTER: 'Enter',\n  SPACE: '',\n  TAB: 'Tab',\n  ESC: 'Escape',\n  HOME: 'Home',\n  END: 'End',\n};\n\nexport const focusSelectedOrFirstAvailable = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  allFocusableButtonsRef: React.MutableRefObject<HTMLButtonElement[]>,\n  selectedButtonRef: React.MutableRefObject<number | null>,\n) => {\n  if (selectedButtonRef.current !== null) {\n    wrapperRef?.current?.querySelectorAll('button')[selectedButtonRef.current].focus();\n  } else {\n    allFocusableButtonsRef?.current[0]?.focus();\n  }\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADEhB,MAAM,OAAO;AAAA,EAClB,MAAM;AAAA,EACN,IAAI;AAAA,EACJ,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AAAA,EACP,KAAK;AAAA,EACL,KAAK;AAAA,EACL,MAAM;AAAA,EACN,KAAK;AACP;AAEO,MAAM,gCAAgC,CAC3C,YACA,wBACA,sBACG;AACH,MAAI,kBAAkB,YAAY,MAAM;AACtC,gBAAY,SAAS,iBAAiB,QAAQ,EAAE,kBAAkB,OAAO,EAAE,MAAM;AAAA,EACnF,OAAO;AACL,4BAAwB,QAAQ,CAAC,GAAG,MAAM;AAAA,EAC5C;AACF;",
+  "sourcesContent": ["import type React from 'react';\n\nexport const keys = {\n  LEFT: 'ArrowLeft',\n  UP: 'ArrowUp',\n  RIGHT: 'ArrowRight',\n  DOWN: 'ArrowDown',\n  ENTER: 'Enter',\n  SPACE: '',\n  TAB: 'Tab',\n  ESC: 'Escape',\n  HOME: 'Home',\n  END: 'End',\n};\n\nexport const focusSelectedOrFirstAvailable = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  allFocusableButtonsRef: HTMLButtonElement[],\n  selectedButtonRef: React.MutableRefObject<number | null>,\n) => {\n  if (selectedButtonRef.current !== null) {\n    wrapperRef?.current?.querySelectorAll('button')[selectedButtonRef.current].focus();\n  } else {\n    allFocusableButtonsRef?.[0]?.focus();\n  }\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADEhB,MAAM,OAAO;AAAA,EAClB,MAAM;AAAA,EACN,IAAI;AAAA,EACJ,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AAAA,EACP,KAAK;AAAA,EACL,KAAK;AAAA,EACL,MAAM;AAAA,EACN,KAAK;AACP;AAEO,MAAM,gCAAgC,CAC3C,YACA,wBACA,sBACG;AACH,MAAI,kBAAkB,YAAY,MAAM;AACtC,gBAAY,SAAS,iBAAiB,QAAQ,EAAE,kBAAkB,OAAO,EAAE,MAAM;AAAA,EACnF,OAAO;AACL,6BAAyB,CAAC,GAAG,MAAM;AAAA,EACrC;AACF;",
   "names": []
 }

package/dist/esm/AppPickerImpl.js

@@ -1,11 +1,12 @@
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useCallback, useMemo } from "react";
+import { useCallback, useRef, useMemo } from "react";
 import { DSChip } from "@elliemae/ds-chip";
 import { keys } from "./utils.js";
 import { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from "./styles.js";
 import { useKeepTrackButtons } from "./hooks/useKeepTrackButtons.js";
 import { DSAppPickerDataTestIds } from "./DSAppPickerDefinitions.js";
+import { useFocusTrap } from "@elliemae/ds-utilities";
 const AppPickerImpl = ({
   apps,
   customApps,
@@ -26,30 +27,8 @@ const AppPickerImpl = ({
     actionRef,
     triggerIsInternal
   });
-  const handleKeyDown = useCallback(
-    (e) => {
-      switch (e.key) {
-        case keys.ESC:
-          triggerRef?.current?.focus();
-          close();
-          break;
-        case keys.TAB:
-          if (e.shiftKey) {
-            if (e.target === allFocusableButtons.current[0]) {
-              e.preventDefault();
-              allFocusableButtons?.current[allFocusableButtons.current.length - 1]?.focus();
-            }
-          } else if (e.target === allFocusableButtons.current[allFocusableButtons.current.length - 1]) {
-            e.preventDefault();
-            allFocusableButtons?.current[0]?.focus();
-          }
-          break;
-        default:
-          break;
-      }
-    },
-    [allFocusableButtons, close, triggerRef]
-  );
+  const firstElementRef = useRef(null);
+  const lastElementRef = useRef(null);
   const handleOnClick = useCallback(
     (app) => (e) => {
       if (app.onClick)
@@ -62,11 +41,19 @@ const AppPickerImpl = ({
       if (onKeyDown)
         onKeyDown(e);
       if (!onKeyDown && e.key === keys.ESC) {
+        triggerRef?.current?.focus();
         close();
       }
     },
-    [onKeyDown, close]
+    [onKeyDown, triggerRef, close]
   );
+  firstElementRef.current = allFocusableButtons[0];
+  lastElementRef.current = allFocusableButtons[allFocusableButtons.length - 1];
+  const handleOnKeyDown = useFocusTrap({
+    firstElementRef,
+    lastElementRef,
+    onKeyDown: handleOnKeyDownWrapper
+  });
   const totalAppsLength = useMemo(() => apps.length + customApps.length, [apps.length, customApps.length]);
   const buildRows = useCallback(
     (appList, prevIndex, title) => /* @__PURE__ */ jsx(Fragment, { children: appList.map((app, index) => {
@@ -76,7 +63,6 @@ const AppPickerImpl = ({
         DSChip,
         {
           onClick: handleOnClick(app),
-          onKeyDown: handleKeyDown,
           "data-testid": DSAppPickerDataTestIds.CHIP,
           "aria-disabled": disabled,
           disabled,
@@ -91,7 +77,7 @@ const AppPickerImpl = ({
         index
       ) });
     }) }),
-    [handleKeyDown, handleOnClick, totalAppsLength]
+    [handleOnClick, totalAppsLength]
   );
   const AppsRows = useMemo(() => buildRows(apps, 1, sectionTitle), [apps, buildRows, sectionTitle]);
   const CustomRows = useMemo(
@@ -123,7 +109,7 @@ const AppPickerImpl = ({
       forwardedAs: "ul",
       role: "listbox",
       ref: convertedTypeReference,
-      onKeyDown: handleOnKeyDownWrapper,
+      onKeyDown: handleOnKeyDown,
       "data-testid": DSAppPickerDataTestIds.WRAPPER,
       isOverflow,
       cols: layout.cols,

package/dist/esm/AppPickerImpl.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/AppPickerImpl.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\n/* eslint-disable react/no-array-index-key */\nimport React, { useCallback, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils.js';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles.js';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds } from './DSAppPickerDefinitions.js';\n\ninterface AppPickerImplProps\n  extends Omit<\n    DSAppPickerT.InternalProps,\n    'onClose' | 'icon' | 'onClick' | 'onClickOutside' | 'renderTrigger' | 'isOpen'\n  > {\n  close: () => void;\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  isOverflow: boolean;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  triggerIsInternal: boolean;\n}\n\nconst AppPickerImpl: React.ComponentType<AppPickerImplProps> = ({\n  apps,\n  customApps,\n  sectionTitle,\n  customSectionTitle,\n  close,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n  triggerIsInternal,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons({\n    wrapperRef,\n    wasOpenedByKeyboardRef,\n    actionRef,\n    triggerIsInternal,\n  });\n\n  // eslint-disable-next-line max-statements\n  const handleKeyDown = useCallback(\n    (e: React.KeyboardEvent) => {\n      switch (e.key) {\n        case keys.ESC:\n          triggerRef?.current?.focus();\n          close();\n          break;\n        case keys.TAB:\n          if (e.shiftKey) {\n            if (e.target === allFocusableButtons.current[0]) {\n              e.preventDefault();\n              allFocusableButtons?.current[allFocusableButtons.current.length - 1]?.focus();\n            }\n          } else if (e.target === allFocusableButtons.current[allFocusableButtons.current.length - 1]) {\n            e.preventDefault();\n            allFocusableButtons?.current[0]?.focus();\n          }\n          break;\n        default:\n          break;\n      }\n    },\n    [allFocusableButtons, close, triggerRef],\n  );\n\n  const handleOnClick = useCallback(\n    (app: DSAppPickerT.AppItem) => (e: React.MouseEvent) => {\n      if (app.onClick) app.onClick(e, app);\n    },\n    [],\n  );\n\n  const handleOnKeyDownWrapper = useCallback(\n    (e: React.KeyboardEvent) => {\n      if (onKeyDown) onKeyDown(e);\n      if (!onKeyDown && e.key === keys.ESC) {\n        close();\n      }\n    },\n    [onKeyDown, close],\n  );\n\n  const totalAppsLength = useMemo(() => apps.length + customApps.length, [apps.length, customApps.length]);\n\n  const buildRows = useCallback(\n    (appList: DSAppPickerT.AppItem[], prevIndex: number, title: string): JSX.Element => (\n      <>\n        {appList.map((app, index) => {\n          const { label, disabled, selected, icon: Icon, id } = app;\n\n          // eslint-disable-next-line react/no-unstable-nested-components\n          const IconComp = () => <Icon className=\"app-picker__icon\" size=\"m\" />;\n\n          return (\n            <StyledListItem role=\"presentation\">\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                onKeyDown={handleKeyDown}\n                data-testid={DSAppPickerDataTestIds.CHIP}\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\n                role=\"option\"\n                id={id}\n                aria-label={`${label}. ${title} (${index + prevIndex} of ${totalAppsLength})`}\n                icon={IconComp}\n                label={label}\n              />\n            </StyledListItem>\n          );\n        })}\n      </>\n    ),\n    [handleKeyDown, handleOnClick, totalAppsLength],\n  );\n\n  const AppsRows = useMemo(() => buildRows(apps, 1, sectionTitle), [apps, buildRows, sectionTitle]);\n  const CustomRows = useMemo(\n    () => buildRows(customApps, apps.length, customSectionTitle),\n    [apps.length, buildRows, customApps, customSectionTitle],\n  );\n\n  const layout = useMemo(() => {\n    const cols = ['repeat(3, 92px)'];\n    let appsRows = 0;\n    let customRows = 0;\n    const rows = [];\n    if (apps.length > 0) {\n      appsRows = apps.length / 3;\n      rows.push('68px', `repeat(${appsRows}, 68px})`);\n    }\n    if (customApps.length > 0) {\n      customRows = customApps.length / 3;\n      rows.push('9px', '68px', `repeat(${customRows}, 68px})`);\n    }\n    return {\n      rows,\n      cols,\n    };\n  }, [apps.length, customApps.length]);\n\n  // Needed just for typescript reasons\n  const convertedTypeReference = wrapperRef as unknown as React.RefObject<HTMLDivElement> &\n    React.RefObject<HTMLUListElement>;\n\n  return (\n    <StyledWrapper\n      forwardedAs=\"ul\"\n      role=\"listbox\"\n      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDownWrapper}\n      data-testid={DSAppPickerDataTestIds.WRAPPER}\n      isOverflow={isOverflow}\n      cols={layout.cols}\n      rows={layout.rows}\n      tabIndex={-1}\n      aria-label={`Application picker, ${sectionTitle} (${apps.length} apps)${\n        customApps.length > 0 ? `, ${customSectionTitle} (${customApps.length} apps)` : ''\n      }`}\n    >\n      <StyledListItemFullRow aria-hidden role=\"group\">\n        <StyledTitle data-testid={DSAppPickerDataTestIds.MAIN_TITLE} role=\"presentation\">\n          {sectionTitle}\n        </StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledSeparator role=\"presentation\" />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledTitle data-testid={DSAppPickerDataTestIds.CUSTOM_TITLE} role=\"presentation\">\n              {customSectionTitle}\n            </StyledTitle>\n          </StyledListItemFullRow>\n          {CustomRows}\n        </>\n      )}\n    </StyledWrapper>\n  );\n};\n\nexport default AppPickerImpl;\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\n/* eslint-disable react/no-array-index-key */\nimport React, { useCallback, useRef, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils.js';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles.js';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds } from './DSAppPickerDefinitions.js';\nimport { useFocusTrap } from '@elliemae/ds-utilities';\n\ninterface AppPickerImplProps\n  extends Omit<\n    DSAppPickerT.InternalProps,\n    'onClose' | 'icon' | 'onClick' | 'onClickOutside' | 'renderTrigger' | 'isOpen'\n  > {\n  close: () => void;\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  isOverflow: boolean;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  triggerIsInternal: boolean;\n}\n\nconst AppPickerImpl: React.ComponentType<AppPickerImplProps> = ({\n  apps,\n  customApps,\n  sectionTitle,\n  customSectionTitle,\n  close,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n  triggerIsInternal,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons({\n    wrapperRef,\n    wasOpenedByKeyboardRef,\n    actionRef,\n    triggerIsInternal,\n  });\n\n  const firstElementRef = useRef<HTMLElement | null>(null);\n  const lastElementRef = useRef<HTMLElement | null>(null);\n\n  const handleOnClick = useCallback(\n    (app: DSAppPickerT.AppItem) => (e: React.MouseEvent) => {\n      if (app.onClick) app.onClick(e, app);\n    },\n    [],\n  );\n\n  const handleOnKeyDownWrapper: React.KeyboardEventHandler = useCallback(\n    (e) => {\n      if (onKeyDown) onKeyDown(e);\n      if (!onKeyDown && e.key === keys.ESC) {\n        triggerRef?.current?.focus();\n        close();\n      }\n    },\n    [onKeyDown, triggerRef, close],\n  );\n  firstElementRef.current = allFocusableButtons[0];\n  lastElementRef.current = allFocusableButtons[allFocusableButtons.length - 1];\n\n  const handleOnKeyDown = useFocusTrap({\n    firstElementRef,\n    lastElementRef,\n    onKeyDown: handleOnKeyDownWrapper,\n  });\n\n  const totalAppsLength = useMemo(() => apps.length + customApps.length, [apps.length, customApps.length]);\n\n  const buildRows = useCallback(\n    (appList: DSAppPickerT.AppItem[], prevIndex: number, title: string): JSX.Element => (\n      <>\n        {appList.map((app, index) => {\n          const { label, disabled, selected, icon: Icon, id } = app;\n\n          // eslint-disable-next-line react/no-unstable-nested-components\n          const IconComp = () => <Icon className=\"app-picker__icon\" size=\"m\" />;\n\n          return (\n            <StyledListItem role=\"presentation\">\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                data-testid={DSAppPickerDataTestIds.CHIP}\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\n                role=\"option\"\n                id={id}\n                aria-label={`${label}. ${title} (${index + prevIndex} of ${totalAppsLength})`}\n                icon={IconComp}\n                label={label}\n              />\n            </StyledListItem>\n          );\n        })}\n      </>\n    ),\n    [handleOnClick, totalAppsLength],\n  );\n\n  const AppsRows = useMemo(() => buildRows(apps, 1, sectionTitle), [apps, buildRows, sectionTitle]);\n  const CustomRows = useMemo(\n    () => buildRows(customApps, apps.length, customSectionTitle),\n    [apps.length, buildRows, customApps, customSectionTitle],\n  );\n\n  const layout = useMemo(() => {\n    const cols = ['repeat(3, 92px)'];\n    let appsRows = 0;\n    let customRows = 0;\n    const rows = [];\n    if (apps.length > 0) {\n      appsRows = apps.length / 3;\n      rows.push('68px', `repeat(${appsRows}, 68px})`);\n    }\n    if (customApps.length > 0) {\n      customRows = customApps.length / 3;\n      rows.push('9px', '68px', `repeat(${customRows}, 68px})`);\n    }\n    return {\n      rows,\n      cols,\n    };\n  }, [apps.length, customApps.length]);\n\n  // Needed just for typescript reasons\n  const convertedTypeReference = wrapperRef as unknown as React.RefObject<HTMLDivElement> &\n    React.RefObject<HTMLUListElement>;\n\n  return (\n    <StyledWrapper\n      forwardedAs=\"ul\"\n      role=\"listbox\"\n      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDown}\n      data-testid={DSAppPickerDataTestIds.WRAPPER}\n      isOverflow={isOverflow}\n      cols={layout.cols}\n      rows={layout.rows}\n      tabIndex={-1}\n      aria-label={`Application picker, ${sectionTitle} (${apps.length} apps)${\n        customApps.length > 0 ? `, ${customSectionTitle} (${customApps.length} apps)` : ''\n      }`}\n    >\n      <StyledListItemFullRow aria-hidden role=\"group\">\n        <StyledTitle data-testid={DSAppPickerDataTestIds.MAIN_TITLE} role=\"presentation\">\n          {sectionTitle}\n        </StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledSeparator role=\"presentation\" />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden role=\"group\">\n            <StyledTitle data-testid={DSAppPickerDataTestIds.CUSTOM_TITLE} role=\"presentation\">\n              {customSectionTitle}\n            </StyledTitle>\n          </StyledListItemFullRow>\n          {CustomRows}\n        </>\n      )}\n    </StyledWrapper>\n  );\n};\n\nexport default AppPickerImpl;\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/DSAppPicker.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
-import { useState, useEffect, useRef, useCallback } from "react";
+import { useState, useEffect, useMemo, useRef, useCallback } from "react";
 import { DSButtonV2 } from "@elliemae/ds-button-v2";
 import { mergeRefs } from "@elliemae/ds-utilities";
 import { describe, useMemoMergePropsWithDefault } from "@elliemae/ds-props-helpers";
@@ -94,24 +94,27 @@ const DSAppPicker = (props) => {
       triggerRef
     ]
   );
-  const RenderTrigger = renderTrigger || (({ ref }) => /* @__PURE__ */ jsx(
-    DSButtonV2,
-    {
-      "data-testid": DSAppPickerDataTestIds.TRIGGER,
-      id: "app-picker__button",
-      buttonType: "icon",
-      "aria-haspopup": "true",
-      "aria-expanded": isOpen ?? open,
-      "aria-label": "Application picker",
-      innerRef: mergeRefs(ref, defaultTriggerRef),
-      onClick: (e) => {
-        wasOpenedByKeyboardRef.current = e.detail === 0;
-        onClick?.(e);
-        setOpen(true);
-      },
-      children: /* @__PURE__ */ jsx(Icon, {})
-    }
-  ));
+  const RenderTrigger = useMemo(
+    () => renderTrigger || (({ ref }) => /* @__PURE__ */ jsx(
+      DSButtonV2,
+      {
+        "data-testid": DSAppPickerDataTestIds.TRIGGER,
+        id: "app-picker__button",
+        buttonType: "icon",
+        "aria-haspopup": "true",
+        "aria-expanded": isOpen ?? open,
+        "aria-label": "Application picker",
+        innerRef: mergeRefs(ref, triggerRef || defaultTriggerRef),
+        onClick: (e) => {
+          wasOpenedByKeyboardRef.current = e.detail === 0;
+          onClick?.(e);
+          setOpen(true);
+        },
+        children: /* @__PURE__ */ jsx(Icon, {})
+      }
+    )),
+    [Icon, isOpen, onClick, open, renderTrigger, triggerRef]
+  );
   return /* @__PURE__ */ jsx(
     DSPopover,
     {

package/dist/esm/DSAppPicker.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/DSAppPicker.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useState, useEffect, useRef, useCallback } from 'react';\nimport { DSButtonV2 } from '@elliemae/ds-button-v2';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport { describe, useMemoMergePropsWithDefault } from '@elliemae/ds-props-helpers';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerPropTypes, defaultProps } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds, DSAppPickerName } from './DSAppPickerDefinitions.js';\n\nconst DSAppPicker: React.ComponentType<DSAppPickerT.Props> = (props) => {\n  const propsWithDefault = useMemoMergePropsWithDefault<DSAppPickerT.InternalProps>(props, defaultProps);\n\n  const {\n    apps,\n    customApps,\n    sectionTitle,\n    customSectionTitle,\n    icon: Icon,\n    renderTrigger,\n    isOpen,\n    onClose,\n    actionRef,\n    onKeyDown,\n    onClick,\n    onClickOutside,\n    triggerRef,\n  } = propsWithDefault;\n\n  const [open, setOpen] = useState(false);\n  const [isOverflow, setIsOverflow] = useState(false);\n  const wrapperRef = useRef<HTMLDivElement>(null);\n  const defaultTriggerRef = useRef(null);\n  const wasOpenedByKeyboardRef = useRef(false);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusToIndex = (index: number) => {\n        if (wrapperRef.current) {\n          const parent = wrapperRef.current;\n          const buttons = [...parent.querySelectorAll('button')];\n          buttons[index].focus();\n        }\n      };\n      actionRef.current.focusWrapper = () => {\n        wrapperRef.current?.focus();\n      };\n    }\n  }, [actionRef, apps, customApps]);\n\n  useEffect(() => {\n    setTimeout(() => {\n      if (wrapperRef.current) {\n        const { scrollHeight, clientHeight } = wrapperRef.current;\n        if (scrollHeight > clientHeight) return setIsOverflow(true);\n      }\n      return setIsOverflow(false);\n    });\n  }, [isOpen, open]);\n\n  const handleOnClose = useCallback(() => {\n    setOpen(false);\n    onClose?.();\n  }, [onClose]);\n\n  const handleOnClickOutside = (e: React.MouseEvent) => {\n    setOpen(false);\n    onClose?.();\n    onClickOutside?.(e);\n  };\n\n  const AppPickerContent = useCallback(\n    () => (\n      <AppPickerImpl\n        apps={apps}\n        customApps={customApps}\n        sectionTitle={sectionTitle}\n        customSectionTitle={customSectionTitle}\n        close={handleOnClose}\n        wrapperRef={wrapperRef}\n        onKeyDown={onKeyDown}\n        triggerRef={triggerRef || defaultTriggerRef}\n        actionRef={actionRef}\n        triggerIsInternal={!renderTrigger}\n        wasOpenedByKeyboardRef={wasOpenedByKeyboardRef}\n        isOverflow={isOverflow}\n      />\n    ),\n    [\n      actionRef,\n      apps,\n      customApps,\n      customSectionTitle,\n      handleOnClose,\n      isOverflow,\n      onKeyDown,\n      renderTrigger,\n      sectionTitle,\n      triggerRef,\n    ],\n  );\n\n  const RenderTrigger =\n    renderTrigger ||\n    (({ ref }: { ref: React.RefObject<HTMLButtonElement> }) => (\n      <DSButtonV2\n        data-testid={DSAppPickerDataTestIds.TRIGGER}\n        id=\"app-picker__button\"\n        buttonType=\"icon\"\n        aria-haspopup=\"true\"\n        aria-expanded={isOpen ?? open}\n        aria-label=\"Application picker\"\n        innerRef={mergeRefs(ref, defaultTriggerRef)}\n        onClick={(e: React.MouseEvent | React.KeyboardEvent) => {\n          wasOpenedByKeyboardRef.current = e.detail === 0;\n          onClick?.(e);\n          setOpen(true);\n        }}\n      >\n        <Icon />\n      </DSButtonV2>\n    ));\n\n  return (\n    <DSPopover\n      content={<AppPickerContent />}\n      isOpen={typeof isOpen === 'boolean' ? isOpen : open}\n      onClickOutside={handleOnClickOutside}\n      placement=\"bottom\"\n      interactionType=\"click\"\n      renderTrigger={RenderTrigger}\n      showArrow\n      style={{\n        padding: '0',\n        maxWidth: '1000px',\n        width: 'fit-content',\n      }}\n    />\n  );\n};\n\nDSAppPicker.displayName = DSAppPickerName;\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = DSAppPickerPropTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';\nimport { DSButtonV2 } from '@elliemae/ds-button-v2';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport { describe, useMemoMergePropsWithDefault } from '@elliemae/ds-props-helpers';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl.js';\nimport type { DSAppPickerT } from './react-desc-prop-types.js';\nimport { DSAppPickerPropTypes, defaultProps } from './react-desc-prop-types.js';\nimport { DSAppPickerDataTestIds, DSAppPickerName } from './DSAppPickerDefinitions.js';\n\nconst DSAppPicker: React.ComponentType<DSAppPickerT.Props> = (props) => {\n  const propsWithDefault = useMemoMergePropsWithDefault<DSAppPickerT.InternalProps>(props, defaultProps);\n\n  const {\n    apps,\n    customApps,\n    sectionTitle,\n    customSectionTitle,\n    icon: Icon,\n    renderTrigger,\n    isOpen,\n    onClose,\n    actionRef,\n    onKeyDown,\n    onClick,\n    onClickOutside,\n    triggerRef,\n  } = propsWithDefault;\n\n  const [open, setOpen] = useState(false);\n  const [isOverflow, setIsOverflow] = useState(false);\n  const wrapperRef = useRef<HTMLDivElement>(null);\n  const defaultTriggerRef = useRef(null);\n  const wasOpenedByKeyboardRef = useRef(false);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusToIndex = (index: number) => {\n        if (wrapperRef.current) {\n          const parent = wrapperRef.current;\n          const buttons = [...parent.querySelectorAll('button')];\n          buttons[index].focus();\n        }\n      };\n      actionRef.current.focusWrapper = () => {\n        wrapperRef.current?.focus();\n      };\n    }\n  }, [actionRef, apps, customApps]);\n\n  useEffect(() => {\n    setTimeout(() => {\n      if (wrapperRef.current) {\n        const { scrollHeight, clientHeight } = wrapperRef.current;\n        if (scrollHeight > clientHeight) return setIsOverflow(true);\n      }\n      return setIsOverflow(false);\n    });\n  }, [isOpen, open]);\n\n  const handleOnClose = useCallback(() => {\n    setOpen(false);\n    onClose?.();\n  }, [onClose]);\n\n  const handleOnClickOutside = (e: React.MouseEvent) => {\n    setOpen(false);\n    onClose?.();\n    onClickOutside?.(e);\n  };\n\n  const AppPickerContent = useCallback(\n    () => (\n      <AppPickerImpl\n        apps={apps}\n        customApps={customApps}\n        sectionTitle={sectionTitle}\n        customSectionTitle={customSectionTitle}\n        close={handleOnClose}\n        wrapperRef={wrapperRef}\n        onKeyDown={onKeyDown}\n        triggerRef={triggerRef || defaultTriggerRef}\n        actionRef={actionRef}\n        triggerIsInternal={!renderTrigger}\n        wasOpenedByKeyboardRef={wasOpenedByKeyboardRef}\n        isOverflow={isOverflow}\n      />\n    ),\n    [\n      actionRef,\n      apps,\n      customApps,\n      customSectionTitle,\n      handleOnClose,\n      isOverflow,\n      onKeyDown,\n      renderTrigger,\n      sectionTitle,\n      triggerRef,\n    ],\n  );\n\n  const RenderTrigger = useMemo(\n    () =>\n      renderTrigger ||\n      (({ ref }: { ref: React.RefObject<HTMLButtonElement> }) => (\n        <DSButtonV2\n          data-testid={DSAppPickerDataTestIds.TRIGGER}\n          id=\"app-picker__button\"\n          buttonType=\"icon\"\n          aria-haspopup=\"true\"\n          aria-expanded={isOpen ?? open}\n          aria-label=\"Application picker\"\n          innerRef={mergeRefs(ref, triggerRef || defaultTriggerRef)}\n          onClick={(e: React.MouseEvent | React.KeyboardEvent) => {\n            wasOpenedByKeyboardRef.current = e.detail === 0;\n            onClick?.(e);\n            setOpen(true);\n          }}\n        >\n          <Icon />\n        </DSButtonV2>\n      )),\n    [Icon, isOpen, onClick, open, renderTrigger, triggerRef],\n  );\n\n  return (\n    <DSPopover\n      content={<AppPickerContent />}\n      isOpen={typeof isOpen === 'boolean' ? isOpen : open}\n      onClickOutside={handleOnClickOutside}\n      placement=\"bottom\"\n      interactionType=\"click\"\n      renderTrigger={RenderTrigger}\n      showArrow\n      style={{\n        padding: '0',\n        maxWidth: '1000px',\n        width: 'fit-content',\n      }}\n    />\n  );\n};\n\nDSAppPicker.displayName = DSAppPickerName;\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = DSAppPickerPropTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/hooks/useKeepTrackButtons.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { focusSelectedOrFirstAvailable } from "../utils.js";
 const useKeepTrackButtons = ({
   wrapperRef,
@@ -7,30 +7,31 @@ const useKeepTrackButtons = ({
   actionRef,
   triggerIsInternal
 }) => {
-  const allFocusableButtons = useRef([]);
+  const [allFocusableButtons, setAllFocusableButtons] = useState([]);
   const selectedButton = useRef(null);
   useEffect(() => {
     if (actionRef && actionRef.current) {
-      actionRef.current.focusSelectedOrFirstAvailable = () => setTimeout(() => focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton));
+      actionRef.current.focusSelectedOrFirstAvailable = () => setTimeout(() => {
+        focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);
+      });
     }
-  }, [actionRef, wrapperRef]);
+  }, [actionRef, allFocusableButtons, wrapperRef]);
   useEffect(() => {
-    setTimeout(() => {
-      wrapperRef?.current?.querySelectorAll("button").forEach((e, index) => {
-        if (!e.hasAttribute("disabled")) {
-          allFocusableButtons?.current?.push(e);
-        }
-        if (e.getAttribute("aria-selected") === "true") {
-          selectedButton.current = index;
-        }
-        if (wasOpenedByKeyboardRef.current || !triggerIsInternal) {
-          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);
-        } else {
-          wrapperRef.current?.focus();
-        }
-      });
+    wrapperRef?.current?.querySelectorAll("button").forEach((e, index) => {
+      if (!e.hasAttribute("disabled"))
+        setAllFocusableButtons((prev) => [...prev, e]);
+      if (e.getAttribute("aria-selected") === "true") {
+        selectedButton.current = index;
+      }
     });
   }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);
+  useEffect(() => {
+    if (wasOpenedByKeyboardRef?.current || !triggerIsInternal) {
+      focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);
+    } else {
+      wrapperRef.current?.focus();
+    }
+  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal, allFocusableButtons]);
   return { allFocusableButtons, selectedButton };
 };
 export {

package/dist/esm/hooks/useKeepTrackButtons.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/hooks/useKeepTrackButtons.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import type React from 'react';\nimport { useEffect, useRef } from 'react';\nimport type { DSAppPickerT } from '../react-desc-prop-types.js';\nimport { focusSelectedOrFirstAvailable } from '../utils.js';\n\ninterface UseKeepTrackButtonsT {\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  actionRef?: DSAppPickerT.ActionRef;\n  triggerIsInternal?: boolean;\n}\n\nexport const useKeepTrackButtons = ({\n  wrapperRef,\n  wasOpenedByKeyboardRef,\n  actionRef,\n  triggerIsInternal,\n}: UseKeepTrackButtonsT) => {\n  const allFocusableButtons = useRef<HTMLButtonElement[]>([]);\n  const selectedButton = useRef<number | null>(null);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusSelectedOrFirstAvailable = () =>\n        setTimeout(() => focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton));\n    }\n  }, [actionRef, wrapperRef]);\n\n  useEffect(() => {\n    setTimeout(() => {\n      wrapperRef?.current?.querySelectorAll('button').forEach((e, index) => {\n        if (!e.hasAttribute('disabled')) {\n          allFocusableButtons?.current?.push(e);\n        }\n        if (e.getAttribute('aria-selected') === 'true') {\n          selectedButton.current = index;\n        }\n        if (wasOpenedByKeyboardRef.current || !triggerIsInternal) {\n          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n        } else {\n          wrapperRef.current?.focus();\n        }\n      });\n    });\n  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);\n\n  return { allFocusableButtons, selectedButton };\n};\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACCvB,SAAS,WAAW,cAAc;AAElC,SAAS,qCAAqC;AASvC,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA4B;AAC1B,QAAM,sBAAsB,OAA4B,CAAC,CAAC;AAC1D,QAAM,iBAAiB,OAAsB,IAAI;AAEjD,YAAU,MAAM;AACd,QAAI,aAAa,UAAU,SAAS;AAClC,gBAAU,QAAQ,gCAAgC,MAChD,WAAW,MAAM,8BAA8B,YAAY,qBAAqB,cAAc,CAAC;AAAA,IACnG;AAAA,EACF,GAAG,CAAC,WAAW,UAAU,CAAC;AAE1B,YAAU,MAAM;AACd,eAAW,MAAM;AACf,kBAAY,SAAS,iBAAiB,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU;AACpE,YAAI,CAAC,EAAE,aAAa,UAAU,GAAG;AAC/B,+BAAqB,SAAS,KAAK,CAAC;AAAA,QACtC;AACA,YAAI,EAAE,aAAa,eAAe,MAAM,QAAQ;AAC9C,yBAAe,UAAU;AAAA,QAC3B;AACA,YAAI,uBAAuB,WAAW,CAAC,mBAAmB;AACxD,wCAA8B,YAAY,qBAAqB,cAAc;AAAA,QAC/E,OAAO;AACL,qBAAW,SAAS,MAAM;AAAA,QAC5B;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH,GAAG,CAAC,wBAAwB,YAAY,iBAAiB,CAAC;AAE1D,SAAO,EAAE,qBAAqB,eAAe;AAC/C;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import type React from 'react';\nimport { useEffect, useRef, useState } from 'react';\nimport type { DSAppPickerT } from '../react-desc-prop-types.js';\nimport { focusSelectedOrFirstAvailable } from '../utils.js';\n\ninterface UseKeepTrackButtonsT {\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n  actionRef?: DSAppPickerT.ActionRef;\n  triggerIsInternal?: boolean;\n}\n\nexport const useKeepTrackButtons = ({\n  wrapperRef,\n  wasOpenedByKeyboardRef,\n  actionRef,\n  triggerIsInternal,\n}: UseKeepTrackButtonsT) => {\n  const [allFocusableButtons, setAllFocusableButtons] = useState<HTMLButtonElement[]>([]);\n  const selectedButton = useRef<number | null>(null);\n\n  useEffect(() => {\n    if (actionRef && actionRef.current) {\n      actionRef.current.focusSelectedOrFirstAvailable = () =>\n        setTimeout(() => {\n          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n        });\n    }\n  }, [actionRef, allFocusableButtons, wrapperRef]);\n\n  useEffect(() => {\n    wrapperRef?.current?.querySelectorAll('button').forEach((e, index) => {\n      if (!e.hasAttribute('disabled')) setAllFocusableButtons((prev) => [...prev, e]);\n      if (e.getAttribute('aria-selected') === 'true') {\n        selectedButton.current = index;\n      }\n    });\n  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);\n\n  useEffect(() => {\n    if (wasOpenedByKeyboardRef?.current || !triggerIsInternal) {\n      focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n    } else {\n      wrapperRef.current?.focus();\n    }\n  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal, allFocusableButtons]);\n\n  return { allFocusableButtons, selectedButton };\n};\n"],
+  "mappings": "AAAA,YAAY,WAAW;ACCvB,SAAS,WAAW,QAAQ,gBAAgB;AAE5C,SAAS,qCAAqC;AASvC,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA4B;AAC1B,QAAM,CAAC,qBAAqB,sBAAsB,IAAI,SAA8B,CAAC,CAAC;AACtF,QAAM,iBAAiB,OAAsB,IAAI;AAEjD,YAAU,MAAM;AACd,QAAI,aAAa,UAAU,SAAS;AAClC,gBAAU,QAAQ,gCAAgC,MAChD,WAAW,MAAM;AACf,sCAA8B,YAAY,qBAAqB,cAAc;AAAA,MAC/E,CAAC;AAAA,IACL;AAAA,EACF,GAAG,CAAC,WAAW,qBAAqB,UAAU,CAAC;AAE/C,YAAU,MAAM;AACd,gBAAY,SAAS,iBAAiB,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU;AACpE,UAAI,CAAC,EAAE,aAAa,UAAU;AAAG,+BAAuB,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC;AAC9E,UAAI,EAAE,aAAa,eAAe,MAAM,QAAQ;AAC9C,uBAAe,UAAU;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,GAAG,CAAC,wBAAwB,YAAY,iBAAiB,CAAC;AAE1D,YAAU,MAAM;AACd,QAAI,wBAAwB,WAAW,CAAC,mBAAmB;AACzD,oCAA8B,YAAY,qBAAqB,cAAc;AAAA,IAC/E,OAAO;AACL,iBAAW,SAAS,MAAM;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,wBAAwB,YAAY,mBAAmB,mBAAmB,CAAC;AAE/E,SAAO,EAAE,qBAAqB,eAAe;AAC/C;",
   "names": []
 }

package/dist/esm/react-desc-prop-types.js

@@ -27,7 +27,10 @@ const DSAppPickerPropTypes = {
   onClose: PropTypes.func.description("Callback function when the AppPicker closes"),
   onKeyDown: PropTypes.func.description("OnKeyDown handler callback."),
   onClick: PropTypes.func.description("Custom onClick for Trigger component."),
-  onClickOutside: PropTypes.func.description("Callback event when the user clicks outside the App Picker.")
+  onClickOutside: PropTypes.func.description("Callback event when the user clicks outside the App Picker."),
+  triggerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(
+    "Ref to the trigger button."
+  )
 };
 export {
   DSAppPickerPropTypes,

package/dist/esm/react-desc-prop-types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/react-desc-prop-types.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React from 'react';\nimport type { WeakValidationMap } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport type { SvgIconT } from '@elliemae/ds-icons';\nimport type { GlobalAttributesT, XstyledProps } from '@elliemae/ds-props-helpers';\nimport { PropTypes } from '@elliemae/ds-props-helpers';\n\nexport declare namespace DSAppPickerT {\n  export interface AppItem {\n    label: string;\n    icon: React.ComponentType<{ className: string; size: string }>;\n    onClick?: (e: React.MouseEvent, item: AppItem) => void | null;\n    disabled?: boolean;\n    id?: string;\n    selected?: boolean;\n  }\n\n  export type ActionRef = React.MutableRefObject<{\n    focusToIndex?: (index: number) => void;\n    focusSelectedOrFirstAvailable?: () => void;\n    focusWrapper: () => void;\n  }>;\n\n  export interface DefaultProps {\n    apps: AppItem[];\n    customApps: AppItem[];\n    sectionTitle: string;\n    customSectionTitle: string;\n    icon: React.ComponentType<SvgIconT.Props>;\n  }\n\n  export interface OptionalProps {\n    onClose?: () => void;\n    onClick?: (e: React.MouseEvent | React.KeyboardEvent) => void;\n    onClickOutside?: (e: React.MouseEvent) => void;\n    onKeyDown?: (e: React.KeyboardEvent) => void;\n    actionRef?: ActionRef;\n    renderTrigger?: React.ComponentType<Record<string, unknown>>;\n    isOpen?: boolean;\n    triggerRef?: React.RefObject<HTMLButtonElement>;\n  }\n\n  export interface Props\n    extends Partial<DefaultProps>,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n\n  export interface InternalProps\n    extends DefaultProps,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n}\n\nexport const defaultProps: DSAppPickerT.DefaultProps = {\n  apps: [],\n  customApps: [],\n  sectionTitle: 'APPLICATIONS',\n  customSectionTitle: 'CUSTOM APPLICATIONS',\n  icon: () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n};\n\n// =============================================================================\n// PropTypes\n// =============================================================================\n\nexport const DSAppPickerPropTypes = {\n  apps: PropTypes.array.description(\n    'Main items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ).isRequired,\n  customApps: PropTypes.array.description(\n    'Custom items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ),\n  sectionTitle: PropTypes.string.description('main section title').defaultValue('APPLICATIONS'),\n  customSectionTitle: PropTypes.string.description('custom section title').defaultValue('CUSTOM APPLICATIONS'),\n  icon: PropTypes.func.description('trigger button s icon').defaultValue(MenuPicker),\n  renderTrigger: PropTypes.func.description('Custom trigger component.'),\n  actionRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(\n    'Ref containing a focusToIndex method. This method allows you to focus any App inside the AppPicker.',\n  ),\n  isOpen: PropTypes.bool.description('Wether the AppPicker should be open or not.'),\n  onClose: PropTypes.func.description('Callback function when the AppPicker closes'),\n  onKeyDown: PropTypes.func.description('OnKeyDown handler callback.'),\n  onClick: PropTypes.func.description('Custom onClick for Trigger component.'),\n  onClickOutside: PropTypes.func.description('Callback event when the user clicks outside the App Picker.'),\n} as WeakValidationMap<unknown>;\n"],
-  "mappings": "AAAA,YAAY,WAAW;AC4DT;AA1Dd,SAAS,kBAAkB;AAG3B,SAAS,iBAAiB;AAkDnB,MAAM,eAA0C;AAAA,EACrD,MAAM,CAAC;AAAA,EACP,YAAY,CAAC;AAAA,EACb,cAAc;AAAA,EACd,oBAAoB;AAAA,EACpB,MAAM,MAAM,oBAAC,cAAW,OAAO,CAAC,iBAAiB,KAAK,GAAG,MAAK,KAAI;AACpE;AAMO,MAAM,uBAAuB;AAAA,EAClC,MAAM,UAAU,MAAM;AAAA,IACpB;AAAA,EACF,EAAE;AAAA,EACF,YAAY,UAAU,MAAM;AAAA,IAC1B;AAAA,EACF;AAAA,EACA,cAAc,UAAU,OAAO,YAAY,oBAAoB,EAAE,aAAa,cAAc;AAAA,EAC5F,oBAAoB,UAAU,OAAO,YAAY,sBAAsB,EAAE,aAAa,qBAAqB;AAAA,EAC3G,MAAM,UAAU,KAAK,YAAY,uBAAuB,EAAE,aAAa,UAAU;AAAA,EACjF,eAAe,UAAU,KAAK,YAAY,2BAA2B;AAAA,EACrE,WAAW,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,EAAE,SAAS,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE;AAAA,IAC5F;AAAA,EACF;AAAA,EACA,QAAQ,UAAU,KAAK,YAAY,6CAA6C;AAAA,EAChF,SAAS,UAAU,KAAK,YAAY,6CAA6C;AAAA,EACjF,WAAW,UAAU,KAAK,YAAY,6BAA6B;AAAA,EACnE,SAAS,UAAU,KAAK,YAAY,uCAAuC;AAAA,EAC3E,gBAAgB,UAAU,KAAK,YAAY,6DAA6D;AAC1G;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React from 'react';\nimport type { WeakValidationMap } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport type { SvgIconT } from '@elliemae/ds-icons';\nimport type { GlobalAttributesT, XstyledProps } from '@elliemae/ds-props-helpers';\nimport { PropTypes } from '@elliemae/ds-props-helpers';\n\nexport declare namespace DSAppPickerT {\n  export interface AppItem {\n    label: string;\n    icon: React.ComponentType<{ className: string; size: string }>;\n    onClick?: (e: React.MouseEvent, item: AppItem) => void | null;\n    disabled?: boolean;\n    id?: string;\n    selected?: boolean;\n  }\n\n  export type ActionRef = React.MutableRefObject<{\n    focusToIndex?: (index: number) => void;\n    focusSelectedOrFirstAvailable?: () => void;\n    focusWrapper: () => void;\n  }>;\n\n  export interface DefaultProps {\n    apps: AppItem[];\n    customApps: AppItem[];\n    sectionTitle: string;\n    customSectionTitle: string;\n    icon: React.ComponentType<SvgIconT.Props>;\n  }\n\n  export interface OptionalProps {\n    onClose?: () => void;\n    onClick?: (e: React.MouseEvent | React.KeyboardEvent) => void;\n    onClickOutside?: (e: React.MouseEvent) => void;\n    onKeyDown?: (e: React.KeyboardEvent) => void;\n    actionRef?: ActionRef;\n    renderTrigger?: React.ComponentType<Record<string, unknown>>;\n    isOpen?: boolean;\n    triggerRef?: React.RefObject<HTMLButtonElement>;\n  }\n\n  export interface Props\n    extends Partial<DefaultProps>,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n\n  export interface InternalProps\n    extends DefaultProps,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLDivElement>, keyof DefaultProps | keyof OptionalProps | keyof XstyledProps>,\n      XstyledProps {}\n}\n\nexport const defaultProps: DSAppPickerT.DefaultProps = {\n  apps: [],\n  customApps: [],\n  sectionTitle: 'APPLICATIONS',\n  customSectionTitle: 'CUSTOM APPLICATIONS',\n  icon: () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n};\n\n// =============================================================================\n// PropTypes\n// =============================================================================\n\nexport const DSAppPickerPropTypes = {\n  apps: PropTypes.array.description(\n    'Main items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ).isRequired,\n  customApps: PropTypes.array.description(\n    'Custom items. Format: [{ label:string, icon:component, onClick:func, disabled:bool, selected:bool }]',\n  ),\n  sectionTitle: PropTypes.string.description('main section title').defaultValue('APPLICATIONS'),\n  customSectionTitle: PropTypes.string.description('custom section title').defaultValue('CUSTOM APPLICATIONS'),\n  icon: PropTypes.func.description('trigger button s icon').defaultValue(MenuPicker),\n  renderTrigger: PropTypes.func.description('Custom trigger component.'),\n  actionRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(\n    'Ref containing a focusToIndex method. This method allows you to focus any App inside the AppPicker.',\n  ),\n  isOpen: PropTypes.bool.description('Wether the AppPicker should be open or not.'),\n  onClose: PropTypes.func.description('Callback function when the AppPicker closes'),\n  onKeyDown: PropTypes.func.description('OnKeyDown handler callback.'),\n  onClick: PropTypes.func.description('Custom onClick for Trigger component.'),\n  onClickOutside: PropTypes.func.description('Callback event when the user clicks outside the App Picker.'),\n  triggerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).description(\n    'Ref to the trigger button.',\n  ),\n} as WeakValidationMap<unknown>;\n"],
+  "mappings": "AAAA,YAAY,WAAW;AC4DT;AA1Dd,SAAS,kBAAkB;AAG3B,SAAS,iBAAiB;AAkDnB,MAAM,eAA0C;AAAA,EACrD,MAAM,CAAC;AAAA,EACP,YAAY,CAAC;AAAA,EACb,cAAc;AAAA,EACd,oBAAoB;AAAA,EACpB,MAAM,MAAM,oBAAC,cAAW,OAAO,CAAC,iBAAiB,KAAK,GAAG,MAAK,KAAI;AACpE;AAMO,MAAM,uBAAuB;AAAA,EAClC,MAAM,UAAU,MAAM;AAAA,IACpB;AAAA,EACF,EAAE;AAAA,EACF,YAAY,UAAU,MAAM;AAAA,IAC1B;AAAA,EACF;AAAA,EACA,cAAc,UAAU,OAAO,YAAY,oBAAoB,EAAE,aAAa,cAAc;AAAA,EAC5F,oBAAoB,UAAU,OAAO,YAAY,sBAAsB,EAAE,aAAa,qBAAqB;AAAA,EAC3G,MAAM,UAAU,KAAK,YAAY,uBAAuB,EAAE,aAAa,UAAU;AAAA,EACjF,eAAe,UAAU,KAAK,YAAY,2BAA2B;AAAA,EACrE,WAAW,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,EAAE,SAAS,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE;AAAA,IAC5F;AAAA,EACF;AAAA,EACA,QAAQ,UAAU,KAAK,YAAY,6CAA6C;AAAA,EAChF,SAAS,UAAU,KAAK,YAAY,6CAA6C;AAAA,EACjF,WAAW,UAAU,KAAK,YAAY,6BAA6B;AAAA,EACnE,SAAS,UAAU,KAAK,YAAY,uCAAuC;AAAA,EAC3E,gBAAgB,UAAU,KAAK,YAAY,6DAA6D;AAAA,EACxG,YAAY,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,EAAE,SAAS,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE;AAAA,IAC7F;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/utils.js

@@ -15,7 +15,7 @@ const focusSelectedOrFirstAvailable = (wrapperRef, allFocusableButtonsRef, selec
   if (selectedButtonRef.current !== null) {
     wrapperRef?.current?.querySelectorAll("button")[selectedButtonRef.current].focus();
   } else {
-    allFocusableButtonsRef?.current[0]?.focus();
+    allFocusableButtonsRef?.[0]?.focus();
   }
 };
 export {

package/dist/esm/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/utils.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import type React from 'react';\n\nexport const keys = {\n  LEFT: 'ArrowLeft',\n  UP: 'ArrowUp',\n  RIGHT: 'ArrowRight',\n  DOWN: 'ArrowDown',\n  ENTER: 'Enter',\n  SPACE: '',\n  TAB: 'Tab',\n  ESC: 'Escape',\n  HOME: 'Home',\n  END: 'End',\n};\n\nexport const focusSelectedOrFirstAvailable = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  allFocusableButtonsRef: React.MutableRefObject<HTMLButtonElement[]>,\n  selectedButtonRef: React.MutableRefObject<number | null>,\n) => {\n  if (selectedButtonRef.current !== null) {\n    wrapperRef?.current?.querySelectorAll('button')[selectedButtonRef.current].focus();\n  } else {\n    allFocusableButtonsRef?.current[0]?.focus();\n  }\n};\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACEhB,MAAM,OAAO;AAAA,EAClB,MAAM;AAAA,EACN,IAAI;AAAA,EACJ,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AAAA,EACP,KAAK;AAAA,EACL,KAAK;AAAA,EACL,MAAM;AAAA,EACN,KAAK;AACP;AAEO,MAAM,gCAAgC,CAC3C,YACA,wBACA,sBACG;AACH,MAAI,kBAAkB,YAAY,MAAM;AACtC,gBAAY,SAAS,iBAAiB,QAAQ,EAAE,kBAAkB,OAAO,EAAE,MAAM;AAAA,EACnF,OAAO;AACL,4BAAwB,QAAQ,CAAC,GAAG,MAAM;AAAA,EAC5C;AACF;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import type React from 'react';\n\nexport const keys = {\n  LEFT: 'ArrowLeft',\n  UP: 'ArrowUp',\n  RIGHT: 'ArrowRight',\n  DOWN: 'ArrowDown',\n  ENTER: 'Enter',\n  SPACE: '',\n  TAB: 'Tab',\n  ESC: 'Escape',\n  HOME: 'Home',\n  END: 'End',\n};\n\nexport const focusSelectedOrFirstAvailable = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  allFocusableButtonsRef: HTMLButtonElement[],\n  selectedButtonRef: React.MutableRefObject<number | null>,\n) => {\n  if (selectedButtonRef.current !== null) {\n    wrapperRef?.current?.querySelectorAll('button')[selectedButtonRef.current].focus();\n  } else {\n    allFocusableButtonsRef?.[0]?.focus();\n  }\n};\n"],
+  "mappings": "AAAA,YAAY,WAAW;ACEhB,MAAM,OAAO;AAAA,EAClB,MAAM;AAAA,EACN,IAAI;AAAA,EACJ,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AAAA,EACP,KAAK;AAAA,EACL,KAAK;AAAA,EACL,MAAM;AAAA,EACN,KAAK;AACP;AAEO,MAAM,gCAAgC,CAC3C,YACA,wBACA,sBACG;AACH,MAAI,kBAAkB,YAAY,MAAM;AACtC,gBAAY,SAAS,iBAAiB,QAAQ,EAAE,kBAAkB,OAAO,EAAE,MAAM;AAAA,EACnF,OAAO;AACL,6BAAyB,CAAC,GAAG,MAAM;AAAA,EACrC;AACF;",
   "names": []
 }

package/dist/types/hooks/useKeepTrackButtons.d.ts

@@ -7,7 +7,7 @@ interface UseKeepTrackButtonsT {
     triggerIsInternal?: boolean;
 }
 export declare const useKeepTrackButtons: ({ wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal, }: UseKeepTrackButtonsT) => {
-    allFocusableButtons: React.MutableRefObject<HTMLButtonElement[]>;
+    allFocusableButtons: HTMLButtonElement[];
     selectedButton: React.MutableRefObject<number | null>;
 };
 export {};

package/dist/types/utils.d.ts

@@ -11,4 +11,4 @@ export declare const keys: {
     HOME: string;
     END: string;
 };
-export declare const focusSelectedOrFirstAvailable: (wrapperRef: React.RefObject<HTMLDivElement>, allFocusableButtonsRef: React.MutableRefObject<HTMLButtonElement[]>, selectedButtonRef: React.MutableRefObject<number | null>) => void;
+export declare const focusSelectedOrFirstAvailable: (wrapperRef: React.RefObject<HTMLDivElement>, allFocusableButtonsRef: HTMLButtonElement[], selectedButtonRef: React.MutableRefObject<number | null>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-app-picker",
-  "version": "3.21.2-rc.2",
+  "version": "3.21.2-rc.3",
   "license": "MIT",
   "description": "ICE MT - Dimsum - App Picker",
   "files": [
@@ -59,14 +59,14 @@
     "indent": 4
   },
   "dependencies": {
-    "@elliemae/ds-chip": "3.21.2-rc.2",
-    "@elliemae/ds-grid": "3.21.2-rc.2",
-    "@elliemae/ds-button-v2": "3.21.2-rc.2",
-    "@elliemae/ds-props-helpers": "3.21.2-rc.2",
-    "@elliemae/ds-icons": "3.21.2-rc.2",
-    "@elliemae/ds-popover": "3.21.2-rc.2",
-    "@elliemae/ds-system": "3.21.2-rc.2",
-    "@elliemae/ds-utilities": "3.21.2-rc.2"
+    "@elliemae/ds-button-v2": "3.21.2-rc.3",
+    "@elliemae/ds-chip": "3.21.2-rc.3",
+    "@elliemae/ds-icons": "3.21.2-rc.3",
+    "@elliemae/ds-grid": "3.21.2-rc.3",
+    "@elliemae/ds-system": "3.21.2-rc.3",
+    "@elliemae/ds-popover": "3.21.2-rc.3",
+    "@elliemae/ds-props-helpers": "3.21.2-rc.3",
+    "@elliemae/ds-utilities": "3.21.2-rc.3"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "~5.16.5",