@elliemae/ds-app-picker 3.10.0-next.2 → 3.10.0-next.4

package/dist/cjs/AppPickerImpl.js

@@ -45,9 +45,10 @@ const AppPickerImpl = ({
   triggerRef,
   isOverflow,
   actionRef,
-  wasOpenedByKeyboardRef
+  wasOpenedByKeyboardRef,
+  triggerIsInternal
 }) => {
-  const { allFocusableButtons } = (0, import_useKeepTrackButtons.useKeepTrackButtons)(wrapperRef, wasOpenedByKeyboardRef, actionRef);
+  const { allFocusableButtons } = (0, import_useKeepTrackButtons.useKeepTrackButtons)(wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal);
   const handleKeyDown = (0, import_react.useCallback)(
     (e) => {
       switch (e.key) {

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 react/prop-types */\n/* eslint-disable react/no-array-index-key */\n/* eslint-disable max-lines */\nimport React, { useCallback, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils';\nimport { AppItemType, DSAppPickerImplType } from './types/AppPickerTypes';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons';\n\nconst AppPickerImpl: DSAppPickerImplType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  close = () => null,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons(wrapperRef, wasOpenedByKeyboardRef, actionRef);\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: AppItemType) => (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: AppItemType[], 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>\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                onKeyDown={handleKeyDown}\n                data-testid=\"app-picker__chip\"\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\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      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDownWrapper}\n      data-testid=\"app-picker__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>\n        <StyledTitle data-testid=\"app-picker__main-title\">{sectionTitle}</StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden>\n            <StyledSeparator />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden>\n            <StyledTitle data-testid=\"app-picker__custom-title\">{customSectionTitle}</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 react/prop-types */\n/* eslint-disable react/no-array-index-key */\n/* eslint-disable max-lines */\nimport React, { useCallback, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils';\nimport { AppItemType, DSAppPickerImplType } from './types/AppPickerTypes';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons';\n\nconst AppPickerImpl: DSAppPickerImplType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  close = () => null,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n  triggerIsInternal,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons(wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal);\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: AppItemType) => (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: AppItemType[], 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>\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                onKeyDown={handleKeyDown}\n                data-testid=\"app-picker__chip\"\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\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      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDownWrapper}\n      data-testid=\"app-picker__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>\n        <StyledTitle data-testid=\"app-picker__main-title\">{sectionTitle}</StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden>\n            <StyledSeparator />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden>\n            <StyledTitle data-testid=\"app-picker__custom-title\">{customSectionTitle}</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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",
   "names": []
 }

package/dist/cjs/DSAppPicker.js

@@ -70,6 +70,9 @@ const DSAppPicker = ({
           buttons[index].focus();
         }
       };
+      actionRef.current.focusWrapper = () => {
+        wrapperRef.current?.focus();
+      };
     }
   }, [actionRef, apps, customApps]);
   (0, import_react.useEffect)(() => {
@@ -102,10 +105,22 @@ const DSAppPicker = ({
       onKeyDown,
       triggerRef: triggerRef || defaultTriggerRef,
       actionRef,
+      triggerIsInternal: !renderTrigger,
       wasOpenedByKeyboardRef,
       isOverflow
     }),
-    [actionRef, apps, customApps, customSectionTitle, handleOnClose, isOverflow, onKeyDown, sectionTitle, triggerRef]
+    [
+      actionRef,
+      apps,
+      customApps,
+      customSectionTitle,
+      handleOnClose,
+      isOverflow,
+      onKeyDown,
+      renderTrigger,
+      sectionTitle,
+      triggerRef
+    ]
   );
   const RenderTrigger = renderTrigger || (({ ref }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ds_button.DSButtonV2, {
     "data-testid": "app-picker__button",

package/dist/cjs/DSAppPicker.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/DSAppPicker.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable react/no-unused-prop-types */\nimport React, { useState, useEffect, useRef, useCallback } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport { DSButtonV2 } from '@elliemae/ds-button';\nimport { describe, mergeRefs } from '@elliemae/ds-utilities';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl';\nimport { propTypes } from './propTypes';\nimport type { DSAppPickerType } from './types/AppPickerTypes';\n\nconst DSAppPicker: DSAppPickerType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  icon: Icon = () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n  renderTrigger,\n  isOpen,\n  onClose = () => null,\n  actionRef,\n  onKeyDown,\n  onClick = () => null,\n  onClickOutside = () => null,\n  triggerRef,\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    }\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        wasOpenedByKeyboardRef={wasOpenedByKeyboardRef}\n        isOverflow={isOverflow}\n      />\n    ),\n    [actionRef, apps, customApps, customSectionTitle, handleOnClose, isOverflow, onKeyDown, sectionTitle, triggerRef],\n  );\n\n  const RenderTrigger =\n    renderTrigger ||\n    (({ ref }: { ref: React.RefObject<HTMLButtonElement> }) => (\n      <DSButtonV2\n        data-testid=\"app-picker__button\"\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) => {\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 = 'DSAppPicker';\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = propTypes;\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;ADAvB;AACA,mBAAgE;AAChE,sBAA2B;AAC3B,uBAA2B;AAC3B,0BAAoC;AACpC,wBAAsB;AACtB,2BAA0B;AAC1B,uBAA0B;AAG1B,MAAM,cAA+B,CAAC;AAAA,EACpC,OAAO,CAAC;AAAA,EACR,aAAa,CAAC;AAAA,EACd,eAAe;AAAA,EACf,qBAAqB;AAAA,EACrB,MAAM,OAAO,MAAM,4CAAC;AAAA,IAAW,OAAO,CAAC,iBAAiB,KAAK;AAAA,IAAG,MAAK;AAAA,GAAI;AAAA,EACzE;AAAA,EACA;AAAA,EACA,UAAU,MAAM;AAAA,EAChB;AAAA,EACA;AAAA,EACA,UAAU,MAAM;AAAA,EAChB,iBAAiB,MAAM;AAAA,EACvB;AACF,MAAM;AACJ,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,OAAO,MAAM;AAAA,QACvB;AAAA,MACF;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,YAAQ;AAAA,EACV,GAAG,CAAC,OAAO,CAAC;AAEZ,QAAM,uBAAuB,CAAC,MAAwB;AACpD,YAAQ,KAAK;AACb,YAAQ;AACR,mBAAe,CAAC;AAAA,EAClB;AAEA,QAAM,uBAAmB;AAAA,IACvB,MACE,4CAAC,qBAAAA,SAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA;AAAA,MACA,YAAY,cAAc;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,KACF;AAAA,IAEF,CAAC,WAAW,MAAM,YAAY,oBAAoB,eAAe,YAAY,WAAW,cAAc,UAAU;AAAA,EAClH;AAEA,QAAM,gBACJ,kBACC,CAAC,EAAE,IAAI,MACN,4CAAC;AAAA,IACC,eAAY;AAAA,IACZ,IAAG;AAAA,IACH,YAAW;AAAA,IACX,iBAAc;AAAA,IACd,iBAAe,UAAU;AAAA,IACzB,cAAW;AAAA,IACX,cAAU,+BAAU,KAAK,iBAAiB;AAAA,IAC1C,SAAS,CAAC,MAAwB;AAChC,6BAAuB,UAAU,EAAE,WAAW;AAC9C,cAAQ,CAAC;AACT,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,sDAAC,QAAK;AAAA,GACR;AAGJ,SACE,4CAAC,kBAAAC,SAAA;AAAA,IACC,SAAS,4CAAC,oBAAiB;AAAA,IAC3B,QAAQ,OAAO,WAAW,YAAY,SAAS;AAAA,IAC/C,gBAAgB;AAAA,IAChB,WAAU;AAAA,IACV,iBAAgB;AAAA,IAChB,eAAe;AAAA,IACf,WAAS;AAAA,IACT,OAAO;AAAA,MACL,SAAS;AAAA,MACT,UAAU;AAAA,MACV,OAAO;AAAA,IACT;AAAA,GACF;AAEJ;AAEA,YAAY,cAAc;AAC1B,MAAM,0BAAsB,8BAAS,WAAW;AAChD,oBAAoB,YAAY;AAGhC,IAAO,sBAAQ;",
+  "sourcesContent": ["/* eslint-disable react/no-unused-prop-types */\nimport React, { useState, useEffect, useRef, useCallback } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport { DSButtonV2 } from '@elliemae/ds-button';\nimport { describe, mergeRefs } from '@elliemae/ds-utilities';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl';\nimport { propTypes } from './propTypes';\nimport type { DSAppPickerType } from './types/AppPickerTypes';\n\nconst DSAppPicker: DSAppPickerType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  icon: Icon = () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n  renderTrigger,\n  isOpen,\n  onClose = () => null,\n  actionRef,\n  onKeyDown,\n  onClick = () => null,\n  onClickOutside = () => null,\n  triggerRef,\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=\"app-picker__button\"\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) => {\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 = 'DSAppPicker';\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = propTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": ["AppPickerImpl", "DSPopover"]
 }

package/dist/cjs/hooks/useKeepTrackButtons.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(useKeepTrackButtons_exports);
 var React = __toESM(require("react"));
 var import_react = require("react");
 var import_utils = require("../utils");
-const useKeepTrackButtons = (wrapperRef, wasOpenedByKeyboardRef, actionRef) => {
+const useKeepTrackButtons = (wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal) => {
   const allFocusableButtons = (0, import_react.useRef)([]);
   const selectedButton = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
@@ -47,14 +47,14 @@ const useKeepTrackButtons = (wrapperRef, wasOpenedByKeyboardRef, actionRef) => {
         if (e.getAttribute("aria-selected") === "true") {
           selectedButton.current = index;
         }
-        if (wasOpenedByKeyboardRef.current) {
+        if (wasOpenedByKeyboardRef.current || !triggerIsInternal) {
           (0, import_utils.focusSelectedOrFirstAvailable)(wrapperRef, allFocusableButtons, selectedButton);
         } else {
           wrapperRef.current?.focus();
         }
       });
     });
-  }, [wasOpenedByKeyboardRef, wrapperRef]);
+  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);
   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 React, { useEffect, useRef } from 'react';\nimport { focusSelectedOrFirstAvailable } from '../utils';\nimport { ActionRef } from '../types/AppPickerTypes';\n\nexport const useKeepTrackButtons = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>,\n  actionRef?: ActionRef,\n) => {\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) {\n          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n        } else {\n          wrapperRef.current?.focus();\n        }\n      });\n    });\n  }, [wasOpenedByKeyboardRef, wrapperRef]);\n\n  return { allFocusableButtons, selectedButton };\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAyC;AACzC,mBAA8C;AAGvC,MAAM,sBAAsB,CACjC,YACA,wBACA,cACG;AACH,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,SAAS;AAClC,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,UAAU,CAAC;AAEvC,SAAO,EAAE,qBAAqB,eAAe;AAC/C;",
+  "sourcesContent": ["import React, { useEffect, useRef } from 'react';\nimport { focusSelectedOrFirstAvailable } from '../utils';\nimport { ActionRef } from '../types/AppPickerTypes';\n\nexport const useKeepTrackButtons = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>,\n  actionRef?: ActionRef,\n  triggerIsInternal?: boolean,\n) => {\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;ADAvB,mBAAyC;AACzC,mBAA8C;AAGvC,MAAM,sBAAsB,CACjC,YACA,wBACA,WACA,sBACG;AACH,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;",
   "names": []
 }

package/dist/cjs/types/AppPickerTypes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/types/AppPickerTypes.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import type { SvgIconType } from '@elliemae/ds-icons';\nimport React from 'react';\n\nexport interface AppItemType {\n  label: string;\n  icon: React.ComponentType<{ className: string; size: string }>;\n  onClick?: (e: React.MouseEvent, item: AppItemType) => void | null;\n  disabled?: boolean;\n  id?: string;\n  selected?: boolean;\n}\n\nexport type ActionRef = React.MutableRefObject<{\n  focusToIndex?: (index: number) => void;\n  focusSelectedOrFirstAvailable?: () => void;\n}>;\n\nexport interface AppPickerPropsType {\n  apps: AppItemType[];\n  customApps: AppItemType[];\n  sectionTitle: string;\n  customSectionTitle: string;\n  icon: SvgIconType;\n  onKeyDown?: (e: React.KeyboardEvent) => void;\n  actionRef?: ActionRef;\n  onClick?: (e: React.MouseEvent) => void;\n  onClickOutside?: (e: React.MouseEvent) => void;\n  renderTrigger?: React.ComponentType<unknown>;\n  isOpen?: boolean;\n  onClose?: () => void;\n  triggerRef?: React.RefObject<HTMLButtonElement>;\n}\n\nexport interface AppPickerImplProps {\n  apps: AppItemType[];\n  customApps: AppItemType[];\n  sectionTitle: string;\n  customSectionTitle: string;\n  close?: () => void;\n  onKeyDown?: (e: React.KeyboardEvent) => void;\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  triggerRef: React.RefObject<HTMLElement>;\n  actionRef?: ActionRef;\n  isOverflow: boolean;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n}\n\nexport type DSAppPickerImplType = React.ComponentType<AppPickerImplProps>;\nexport type DSAppPickerType = React.ComponentType<AppPickerPropsType>;\n", "import * as React from 'react';\nexport { React };\n"],
+  "sourcesContent": ["import type { SvgIconType } from '@elliemae/ds-icons';\nimport React from 'react';\n\nexport interface AppItemType {\n  label: string;\n  icon: React.ComponentType<{ className: string; size: string }>;\n  onClick?: (e: React.MouseEvent, item: AppItemType) => void | null;\n  disabled?: boolean;\n  id?: string;\n  selected?: boolean;\n}\n\nexport type ActionRef = React.MutableRefObject<{\n  focusToIndex?: (index: number) => void;\n  focusSelectedOrFirstAvailable?: () => void;\n  focusWrapper: () => void;\n}>;\n\nexport interface AppPickerPropsType {\n  apps: AppItemType[];\n  customApps: AppItemType[];\n  sectionTitle: string;\n  customSectionTitle: string;\n  icon: SvgIconType;\n  onKeyDown?: (e: React.KeyboardEvent) => void;\n  actionRef?: ActionRef;\n  onClick?: (e: React.MouseEvent) => void;\n  onClickOutside?: (e: React.MouseEvent) => void;\n  renderTrigger?: React.ComponentType<unknown>;\n  isOpen?: boolean;\n  onClose?: () => void;\n  triggerRef?: React.RefObject<HTMLButtonElement>;\n}\n\nexport interface AppPickerImplProps {\n  apps: AppItemType[];\n  customApps: AppItemType[];\n  sectionTitle: string;\n  customSectionTitle: string;\n  close?: () => void;\n  onKeyDown?: (e: React.KeyboardEvent) => void;\n  wrapperRef: React.RefObject<HTMLDivElement>;\n  triggerRef: React.RefObject<HTMLElement>;\n  actionRef?: ActionRef;\n  isOverflow: boolean;\n  triggerIsInternal: boolean;\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>;\n}\n\nexport type DSAppPickerImplType = React.ComponentType<AppPickerImplProps>;\nexport type DSAppPickerType = React.ComponentType<AppPickerPropsType>;\n", "import * as React from 'react';\nexport { React };\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;ACAA,YAAuB;",
   "names": []
 }

package/dist/esm/AppPickerImpl.js

@@ -16,9 +16,10 @@ const AppPickerImpl = ({
   triggerRef,
   isOverflow,
   actionRef,
-  wasOpenedByKeyboardRef
+  wasOpenedByKeyboardRef,
+  triggerIsInternal
 }) => {
-  const { allFocusableButtons } = useKeepTrackButtons(wrapperRef, wasOpenedByKeyboardRef, actionRef);
+  const { allFocusableButtons } = useKeepTrackButtons(wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal);
   const handleKeyDown = useCallback(
     (e) => {
       switch (e.key) {

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 react/prop-types */\n/* eslint-disable react/no-array-index-key */\n/* eslint-disable max-lines */\nimport React, { useCallback, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils';\nimport { AppItemType, DSAppPickerImplType } from './types/AppPickerTypes';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons';\n\nconst AppPickerImpl: DSAppPickerImplType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  close = () => null,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons(wrapperRef, wasOpenedByKeyboardRef, actionRef);\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: AppItemType) => (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: AppItemType[], 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>\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                onKeyDown={handleKeyDown}\n                data-testid=\"app-picker__chip\"\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\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      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDownWrapper}\n      data-testid=\"app-picker__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>\n        <StyledTitle data-testid=\"app-picker__main-title\">{sectionTitle}</StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden>\n            <StyledSeparator />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden>\n            <StyledTitle data-testid=\"app-picker__custom-title\">{customSectionTitle}</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 react/prop-types */\n/* eslint-disable react/no-array-index-key */\n/* eslint-disable max-lines */\nimport React, { useCallback, useMemo } from 'react';\nimport { DSChip } from '@elliemae/ds-chip';\nimport { keys } from './utils';\nimport { AppItemType, DSAppPickerImplType } from './types/AppPickerTypes';\nimport { StyledWrapper, StyledSeparator, StyledListItemFullRow, StyledListItem, StyledTitle } from './styles';\nimport { useKeepTrackButtons } from './hooks/useKeepTrackButtons';\n\nconst AppPickerImpl: DSAppPickerImplType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  close = () => null,\n  wrapperRef,\n  onKeyDown,\n  triggerRef,\n  isOverflow,\n  actionRef,\n  wasOpenedByKeyboardRef,\n  triggerIsInternal,\n}) => {\n  const { allFocusableButtons } = useKeepTrackButtons(wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal);\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: AppItemType) => (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: AppItemType[], 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>\n              <DSChip\n                key={index}\n                onClick={handleOnClick(app)}\n                onKeyDown={handleKeyDown}\n                data-testid=\"app-picker__chip\"\n                aria-disabled={disabled}\n                disabled={disabled}\n                selected={selected}\n                aria-selected={selected}\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      ref={convertedTypeReference}\n      onKeyDown={handleOnKeyDownWrapper}\n      data-testid=\"app-picker__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>\n        <StyledTitle data-testid=\"app-picker__main-title\">{sectionTitle}</StyledTitle>\n      </StyledListItemFullRow>\n      {AppsRows}\n      {customApps.length > 0 && (\n        <>\n          <StyledListItemFullRow aria-hidden>\n            <StyledSeparator />\n          </StyledListItemFullRow>\n          <StyledListItemFullRow aria-hidden>\n            <StyledTitle data-testid=\"app-picker__custom-title\">{customSectionTitle}</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

@@ -39,6 +39,9 @@ const DSAppPicker = ({
           buttons[index].focus();
         }
       };
+      actionRef.current.focusWrapper = () => {
+        wrapperRef.current?.focus();
+      };
     }
   }, [actionRef, apps, customApps]);
   useEffect(() => {
@@ -71,10 +74,22 @@ const DSAppPicker = ({
       onKeyDown,
       triggerRef: triggerRef || defaultTriggerRef,
       actionRef,
+      triggerIsInternal: !renderTrigger,
       wasOpenedByKeyboardRef,
       isOverflow
     }),
-    [actionRef, apps, customApps, customSectionTitle, handleOnClose, isOverflow, onKeyDown, sectionTitle, triggerRef]
+    [
+      actionRef,
+      apps,
+      customApps,
+      customSectionTitle,
+      handleOnClose,
+      isOverflow,
+      onKeyDown,
+      renderTrigger,
+      sectionTitle,
+      triggerRef
+    ]
   );
   const RenderTrigger = renderTrigger || (({ ref }) => /* @__PURE__ */ jsx(DSButtonV2, {
     "data-testid": "app-picker__button",

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", "/* eslint-disable react/no-unused-prop-types */\nimport React, { useState, useEffect, useRef, useCallback } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport { DSButtonV2 } from '@elliemae/ds-button';\nimport { describe, mergeRefs } from '@elliemae/ds-utilities';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl';\nimport { propTypes } from './propTypes';\nimport type { DSAppPickerType } from './types/AppPickerTypes';\n\nconst DSAppPicker: DSAppPickerType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  icon: Icon = () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n  renderTrigger,\n  isOpen,\n  onClose = () => null,\n  actionRef,\n  onKeyDown,\n  onClick = () => null,\n  onClickOutside = () => null,\n  triggerRef,\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    }\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        wasOpenedByKeyboardRef={wasOpenedByKeyboardRef}\n        isOverflow={isOverflow}\n      />\n    ),\n    [actionRef, apps, customApps, customSectionTitle, handleOnClose, isOverflow, onKeyDown, sectionTitle, triggerRef],\n  );\n\n  const RenderTrigger =\n    renderTrigger ||\n    (({ ref }: { ref: React.RefObject<HTMLButtonElement> }) => (\n      <DSButtonV2\n        data-testid=\"app-picker__button\"\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) => {\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 = 'DSAppPicker';\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = propTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/no-unused-prop-types */\nimport React, { useState, useEffect, useRef, useCallback } from 'react';\nimport { MenuPicker } from '@elliemae/ds-icons';\nimport { DSButtonV2 } from '@elliemae/ds-button';\nimport { describe, mergeRefs } from '@elliemae/ds-utilities';\nimport DSPopover from '@elliemae/ds-popover';\nimport AppPickerImpl from './AppPickerImpl';\nimport { propTypes } from './propTypes';\nimport type { DSAppPickerType } from './types/AppPickerTypes';\n\nconst DSAppPicker: DSAppPickerType = ({\n  apps = [],\n  customApps = [],\n  sectionTitle = 'APPLICATIONS',\n  customSectionTitle = 'CUSTOM APPLICATIONS',\n  icon: Icon = () => <MenuPicker color={['brand-primary', '700']} size=\"m\" />,\n  renderTrigger,\n  isOpen,\n  onClose = () => null,\n  actionRef,\n  onKeyDown,\n  onClick = () => null,\n  onClickOutside = () => null,\n  triggerRef,\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=\"app-picker__button\"\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) => {\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 = 'DSAppPicker';\nconst AppPickerWithSchema = describe(DSAppPicker);\nAppPickerWithSchema.propTypes = propTypes;\n\nexport { DSAppPicker, AppPickerWithSchema };\nexport default DSAppPicker;\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/hooks/useKeepTrackButtons.js

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useEffect, useRef } from "react";
 import { focusSelectedOrFirstAvailable } from "../utils";
-const useKeepTrackButtons = (wrapperRef, wasOpenedByKeyboardRef, actionRef) => {
+const useKeepTrackButtons = (wrapperRef, wasOpenedByKeyboardRef, actionRef, triggerIsInternal) => {
   const allFocusableButtons = useRef([]);
   const selectedButton = useRef(null);
   useEffect(() => {
@@ -18,14 +18,14 @@ const useKeepTrackButtons = (wrapperRef, wasOpenedByKeyboardRef, actionRef) => {
         if (e.getAttribute("aria-selected") === "true") {
           selectedButton.current = index;
         }
-        if (wasOpenedByKeyboardRef.current) {
+        if (wasOpenedByKeyboardRef.current || !triggerIsInternal) {
           focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);
         } else {
           wrapperRef.current?.focus();
         }
       });
     });
-  }, [wasOpenedByKeyboardRef, wrapperRef]);
+  }, [wasOpenedByKeyboardRef, wrapperRef, triggerIsInternal]);
   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 React, { useEffect, useRef } from 'react';\nimport { focusSelectedOrFirstAvailable } from '../utils';\nimport { ActionRef } from '../types/AppPickerTypes';\n\nexport const useKeepTrackButtons = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>,\n  actionRef?: ActionRef,\n) => {\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) {\n          focusSelectedOrFirstAvailable(wrapperRef, allFocusableButtons, selectedButton);\n        } else {\n          wrapperRef.current?.focus();\n        }\n      });\n    });\n  }, [wasOpenedByKeyboardRef, wrapperRef]);\n\n  return { allFocusableButtons, selectedButton };\n};\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAgB,WAAW,cAAc;AACzC,SAAS,qCAAqC;AAGvC,MAAM,sBAAsB,CACjC,YACA,wBACA,cACG;AACH,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,SAAS;AAClC,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,UAAU,CAAC;AAEvC,SAAO,EAAE,qBAAqB,eAAe;AAC/C;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useEffect, useRef } from 'react';\nimport { focusSelectedOrFirstAvailable } from '../utils';\nimport { ActionRef } from '../types/AppPickerTypes';\n\nexport const useKeepTrackButtons = (\n  wrapperRef: React.RefObject<HTMLDivElement>,\n  wasOpenedByKeyboardRef: React.MutableRefObject<boolean>,\n  actionRef?: ActionRef,\n  triggerIsInternal?: boolean,\n) => {\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;ACAvB,SAAgB,WAAW,cAAc;AACzC,SAAS,qCAAqC;AAGvC,MAAM,sBAAsB,CACjC,YACA,wBACA,WACA,sBACG;AACH,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;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-app-picker",
-  "version": "3.10.0-next.2",
+  "version": "3.10.0-next.4",
   "license": "MIT",
   "description": "ICE MT - Dimsum - App Picker",
   "files": [
@@ -59,13 +59,13 @@
     "indent": 4
   },
   "dependencies": {
-    "@elliemae/ds-button": "3.10.0-next.2",
-    "@elliemae/ds-chip": "3.10.0-next.2",
-    "@elliemae/ds-grid": "3.10.0-next.2",
-    "@elliemae/ds-icons": "3.10.0-next.2",
-    "@elliemae/ds-popover": "3.10.0-next.2",
-    "@elliemae/ds-system": "3.10.0-next.2",
-    "@elliemae/ds-utilities": "3.10.0-next.2"
+    "@elliemae/ds-button": "3.10.0-next.4",
+    "@elliemae/ds-chip": "3.10.0-next.4",
+    "@elliemae/ds-grid": "3.10.0-next.4",
+    "@elliemae/ds-icons": "3.10.0-next.4",
+    "@elliemae/ds-popover": "3.10.0-next.4",
+    "@elliemae/ds-system": "3.10.0-next.4",
+    "@elliemae/ds-utilities": "3.10.0-next.4"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "~5.16.4",