@elliemae/ds-data-table 3.4.3-rc.1 → 3.5.0-rc.2

package/dist/cjs/addons/Filters/Components/CurrencyRangeFilter/index.js

@@ -43,6 +43,7 @@ const opts = {
 };
 const CurrencyRangeFilter = (props) => {
   const { column, filterValue = { from: null, to: null }, reduxHeader, patchHeader, onValueChange, innerRef } = props;
+  const ref = (0, import_react.useRef)();
   const handleFromChange = (e) => {
     const nextValue = {
       ...filterValue,
@@ -63,6 +64,13 @@ const CurrencyRangeFilter = (props) => {
       innerRef.current.focus();
     }
   };
+  const handleRef = (0, import_react.useCallback)((newRef) => {
+    if (ref.current)
+      ref.current = newRef;
+    if (!reduxHeader?.hideFilterMenu) {
+      setTimeout(() => newRef?.focus());
+    }
+  }, [reduxHeader?.hideFilterMenu]);
   const idPreffix = "datatable-currency-range";
   return /* @__PURE__ */ import_react.default.createElement(import_exported_related.FilterPopover, {
     reduxHeader,
@@ -84,7 +92,7 @@ const CurrencyRangeFilter = (props) => {
       onChange: handleFromChange,
       placeholder: "0.00",
       mask: (number) => import_ds_form.MASK_TYPES.NUMBER(opts)(number),
-      autoFocus: true,
+      innerRef: handleRef,
       onKeyDown: (e) => {
         closePopover(e);
       }

package/dist/cjs/addons/Filters/Components/CurrencyRangeFilter/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/addons/Filters/Components/CurrencyRangeFilter/index.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React from 'react';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSInputMask, MASK_TYPES } from '@elliemae/ds-form';\nimport { DSFormLayoutBlockItem } from '@elliemae/ds-form-layout-blocks';\nimport { SearchXsmall } from '@elliemae/ds-icons';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst opts = {\n  prefix: '',\n  suffix: '',\n  allowDecimal: true,\n  decimalLimit: 2,\n  includeThousandsSeparator: false,\n  requireDecimal: true,\n  allowNegative: true,\n};\n\nexport const CurrencyRangeFilter: React.ComponentType<FilterProps> = (props) => {\n  const { column, filterValue = { from: null, to: null }, reduxHeader, patchHeader, onValueChange, innerRef } = props;\n\n  const handleFromChange = (e) => {\n    const nextValue = {\n      ...filterValue,\n      from: e.target.value,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n  const handleToChange = (e) => {\n    const nextValue = {\n      ...filterValue,\n      to: e.target.value,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n\n  // workaround to close menu with esc key since DSInputMask has stoppropagation on key down\n  const closePopover = (e) => {\n    if (e.code === 'Escape') {\n      patchHeader(column.id, { hideFilterMenu: true, hideFilterButton: false });\n      innerRef.current.focus();\n    }\n  };\n\n  const idPreffix = 'datatable-currency-range';\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={\n        <Grid\n          data-testid={DATA_TESTID.DATA_TABLE_CURRENCY_RANGE_CONTROLLER}\n          gutter=\"xxxs\"\n          padding=\"xxs\"\n          cols={['auto', 'auto']}\n          style={{ background: 'white' }}\n        >\n          <DSFormLayoutBlockItem label=\"Min\" inputID={`${idPreffix}-min-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-min-${column.id}`}\n              value={`${filterValue?.from ?? ''}`}\n              onChange={handleFromChange}\n              placeholder=\"0.00\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              autoFocus\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n          <DSFormLayoutBlockItem label=\"Max\" inputID={`${idPreffix}-max-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-max-${column.id}`}\n              value={`${filterValue?.to ?? ''}`}\n              onChange={handleToChange}\n              placeholder=\"0.00\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n        </Grid>\n      }\n      triggerIcon={<SearchXsmall />}\n      customStyles={{ width: column.ref?.current?.offsetWidth ?? '0px' }}\n      innerRef={innerRef}\n      ariaLabel=\"Open Currency Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAkB;AAClB,qBAAqB;AACrB,qBAAwC;AACxC,mCAAsC;AACtC,sBAA6B;AAC7B,8BAA4C;AAE5C,uBAA4B;AAE5B,MAAM,OAAO;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,cAAc;AAAA,EACd,cAAc;AAAA,EACd,2BAA2B;AAAA,EAC3B,gBAAgB;AAAA,EAChB,eAAe;AACjB;AAEO,MAAM,sBAAwD,CAAC,UAAU;AAC9E,QAAM,EAAE,QAAQ,cAAc,EAAE,MAAM,MAAM,IAAI,KAAK,GAAG,aAAa,aAAa,eAAe,aAAa;AAE9G,QAAM,mBAAmB,CAAC,MAAM;AAC9B,UAAM,YAAY;AAAA,MAChB,GAAG;AAAA,MACH,MAAM,EAAE,OAAO;AAAA,IACjB;AACA,kBAAc,qCAAa,gBAAgB,SAAS;AAAA,EACtD;AACA,QAAM,iBAAiB,CAAC,MAAM;AAC5B,UAAM,YAAY;AAAA,MAChB,GAAG;AAAA,MACH,IAAI,EAAE,OAAO;AAAA,IACf;AACA,kBAAc,qCAAa,gBAAgB,SAAS;AAAA,EACtD;AAGA,QAAM,eAAe,CAAC,MAAM;AAC1B,QAAI,EAAE,SAAS,UAAU;AACvB,kBAAY,OAAO,IAAI,EAAE,gBAAgB,MAAM,kBAAkB,MAAM,CAAC;AACxE,eAAS,QAAQ,MAAM;AAAA,IACzB;AAAA,EACF;AAEA,QAAM,YAAY;AAClB,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU,OAAO;AAAA,IACjB,aACE,mDAAC;AAAA,MACC,eAAa,6BAAY;AAAA,MACzB,QAAO;AAAA,MACP,SAAQ;AAAA,MACR,MAAM,CAAC,QAAQ,MAAM;AAAA,MACrB,OAAO,EAAE,YAAY,QAAQ;AAAA,OAE7B,mDAAC;AAAA,MAAsB,OAAM;AAAA,MAAM,SAAS,GAAG,iBAAiB,OAAO;AAAA,OACrE,mDAAC;AAAA,MACC,gBAAgB,EAAE,OAAO,EAAE,WAAW,QAAQ,EAAE;AAAA,MAChD,IAAI,GAAG,iBAAiB,OAAO;AAAA,MAC/B,OAAO,GAAG,aAAa,QAAQ;AAAA,MAC/B,UAAU;AAAA,MACV,aAAY;AAAA,MACZ,MAAM,CAAC,WAAW,0BAAW,OAAO,IAAI,EAAE,MAAM;AAAA,MAChD,WAAS;AAAA,MACT,WAAW,CAAC,MAAM;AAChB,qBAAa,CAAC;AAAA,MAChB;AAAA,KACF,CACF,GACA,mDAAC;AAAA,MAAsB,OAAM;AAAA,MAAM,SAAS,GAAG,iBAAiB,OAAO;AAAA,OACrE,mDAAC;AAAA,MACC,gBAAgB,EAAE,OAAO,EAAE,WAAW,QAAQ,EAAE;AAAA,MAChD,IAAI,GAAG,iBAAiB,OAAO;AAAA,MAC/B,OAAO,GAAG,aAAa,MAAM;AAAA,MAC7B,UAAU;AAAA,MACV,aAAY;AAAA,MACZ,MAAM,CAAC,WAAW,0BAAW,OAAO,IAAI,EAAE,MAAM;AAAA,MAChD,WAAW,CAAC,MAAM;AAChB,qBAAa,CAAC;AAAA,MAChB;AAAA,KACF,CACF,CACF;AAAA,IAEF,aAAa,mDAAC,kCAAa;AAAA,IAC3B,cAAc,EAAE,OAAO,OAAO,KAAK,SAAS,eAAe,MAAM;AAAA,IACjE;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
+  "sourcesContent": ["import React, { useRef, useCallback } from 'react';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSInputMask, MASK_TYPES } from '@elliemae/ds-form';\nimport { DSFormLayoutBlockItem } from '@elliemae/ds-form-layout-blocks';\nimport { SearchXsmall } from '@elliemae/ds-icons';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst opts = {\n  prefix: '',\n  suffix: '',\n  allowDecimal: true,\n  decimalLimit: 2,\n  includeThousandsSeparator: false,\n  requireDecimal: true,\n  allowNegative: true,\n};\n\nexport const CurrencyRangeFilter: React.ComponentType<FilterProps> = (props) => {\n  const { column, filterValue = { from: null, to: null }, reduxHeader, patchHeader, onValueChange, innerRef } = props;\n\n  const ref = useRef();\n  const handleFromChange = (e) => {\n    const nextValue = {\n      ...filterValue,\n      from: e.target.value,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n  const handleToChange = (e) => {\n    const nextValue = {\n      ...filterValue,\n      to: e.target.value,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n\n  // workaround to close menu with esc key since DSInputMask has stoppropagation on key down\n  const closePopover = (e) => {\n    if (e.code === 'Escape') {\n      patchHeader(column.id, { hideFilterMenu: true, hideFilterButton: false });\n      innerRef.current.focus();\n    }\n  };\n\n  const handleRef = useCallback(\n    (newRef) => {\n      if (ref.current) ref.current = newRef;\n      if (!reduxHeader?.hideFilterMenu) {\n        setTimeout(() => newRef?.focus());\n      }\n    },\n    [reduxHeader?.hideFilterMenu],\n  );\n\n  const idPreffix = 'datatable-currency-range';\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={\n        <Grid\n          data-testid={DATA_TESTID.DATA_TABLE_CURRENCY_RANGE_CONTROLLER}\n          gutter=\"xxxs\"\n          padding=\"xxs\"\n          cols={['auto', 'auto']}\n          style={{ background: 'white' }}\n        >\n          <DSFormLayoutBlockItem label=\"Min\" inputID={`${idPreffix}-min-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-min-${column.id}`}\n              value={`${filterValue?.from ?? ''}`}\n              onChange={handleFromChange}\n              placeholder=\"0.00\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              innerRef={handleRef}\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n          <DSFormLayoutBlockItem label=\"Max\" inputID={`${idPreffix}-max-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-max-${column.id}`}\n              value={`${filterValue?.to ?? ''}`}\n              onChange={handleToChange}\n              placeholder=\"0.00\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n        </Grid>\n      }\n      triggerIcon={<SearchXsmall />}\n      customStyles={{ width: column.ref?.current?.offsetWidth ?? '0px' }}\n      innerRef={innerRef}\n      ariaLabel=\"Open Currency Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/addons/Filters/Components/DateRangeFilter/index.js

@@ -54,6 +54,23 @@ const DateRangeFilter = (props) => {
       onValueChange(import_exported_related.FILTER_TYPES.DATE_RANGE, { startDate, endDate });
     }
   }, [startDate, endDate]);
+  const ref = (0, import_react.useRef)();
+  const shouldFocus = (0, import_react.useRef)(true);
+  const handleRef = (0, import_react.useCallback)((newRef) => {
+    if (ref.current)
+      ref.current = newRef;
+    if (shouldFocus.current) {
+      setTimeout(() => {
+        newRef?.focus();
+        shouldFocus.current = false;
+      });
+    }
+  }, []);
+  (0, import_react.useEffect)(() => {
+    if (reduxHeader?.hideFilterMenu) {
+      shouldFocus.current = true;
+    }
+  }, [reduxHeader?.hideFilterMenu]);
   return /* @__PURE__ */ import_react.default.createElement(import_exported_related.FilterPopover, {
     reduxHeader,
     column,
@@ -70,7 +87,7 @@ const DateRangeFilter = (props) => {
       toDate: endDate,
       onToDateChange: setEndDate,
       type: "date-range-inputs",
-      autoFocus: true
+      innerRef: handleRef
     })), /* @__PURE__ */ import_react.default.createElement(import_ds_grid.Grid, {
       onKeyDown: (e) => e.code === "Enter" && setTimeout(() => patchHeaderFilterButtonAndMenu(id, !!(dateRange.startDate || dateRange.endDate)), 0)
     }, /* @__PURE__ */ import_react.default.createElement(import_ds_controlled_form.DSControlledDateRangePicker, {

package/dist/cjs/addons/Filters/Components/DateRangeFilter/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/addons/Filters/Components/DateRangeFilter/index.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useEffect, useState } from 'react';\nimport { DatePicker2 } from '@elliemae/ds-icons';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSControlledDateRangePicker } from '@elliemae/ds-controlled-form';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst emptyFilterValue = { startDate: null, endDate: null };\n\nexport const DateRangeFilter: React.ComponentType<FilterProps> = (props) => {\n  const {\n    column,\n    column: { id },\n    filterValue = emptyFilterValue,\n    onValueChange,\n    patchHeaderFilterButtonAndMenu,\n    reduxHeader,\n    innerRef,\n  } = props;\n\n  const dateRange = filterValue;\n\n  const [startDate, setStartDate] = useState(dateRange.startDate || '');\n  const [endDate, setEndDate] = useState(dateRange.endDate || '');\n\n  useEffect(() => {\n    setStartDate(dateRange.startDate || '');\n    setEndDate(dateRange.endDate || '');\n  }, [dateRange]);\n\n  useEffect(() => {\n    if (startDate && endDate && !startDate.includes('_') && !endDate.includes('_')) {\n      onValueChange(FILTER_TYPES.DATE_RANGE, { startDate, endDate });\n    }\n    // We are missing onValueChange on purpose, this is an internal function and won't cause any problems\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [startDate, endDate]);\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={id}\n      menuContent={\n        <Grid width=\"260px\" data-testid={DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER}>\n          <Grid p=\"xxs\" style={{ background: 'white' }}>\n            <DSControlledDateRangePicker\n              fromDate={startDate}\n              onFromDateChange={setStartDate}\n              toDate={endDate}\n              onToDateChange={setEndDate}\n              type=\"date-range-inputs\"\n              autoFocus\n            />\n          </Grid>\n          <Grid\n            onKeyDown={(e) =>\n              e.code === 'Enter' &&\n              setTimeout(() => patchHeaderFilterButtonAndMenu(id, !!(dateRange.startDate || dateRange.endDate)), 0)\n            }\n          >\n            <DSControlledDateRangePicker\n              fromDate={startDate}\n              onFromDateChange={setStartDate}\n              toDate={endDate}\n              onToDateChange={setEndDate}\n              type=\"date-range-picker-controller-only\"\n            />\n          </Grid>\n        </Grid>\n      }\n      triggerIcon={<DatePicker2 />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Date Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA2C;AAC3C,sBAA4B;AAC5B,qBAAqB;AACrB,gCAA4C;AAC5C,8BAA4C;AAE5C,uBAA4B;AAE5B,MAAM,mBAAmB,EAAE,WAAW,MAAM,SAAS,KAAK;AAEnD,MAAM,kBAAoD,CAAC,UAAU;AAC1E,QAAM;AAAA,IACJ;AAAA,IACA,QAAQ,EAAE;AAAA,IACV,cAAc;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,YAAY;AAElB,QAAM,CAAC,WAAW,gBAAgB,2BAAS,UAAU,aAAa,EAAE;AACpE,QAAM,CAAC,SAAS,cAAc,2BAAS,UAAU,WAAW,EAAE;AAE9D,8BAAU,MAAM;AACd,iBAAa,UAAU,aAAa,EAAE;AACtC,eAAW,UAAU,WAAW,EAAE;AAAA,EACpC,GAAG,CAAC,SAAS,CAAC;AAEd,8BAAU,MAAM;AACd,QAAI,aAAa,WAAW,CAAC,UAAU,SAAS,GAAG,KAAK,CAAC,QAAQ,SAAS,GAAG,GAAG;AAC9E,oBAAc,qCAAa,YAAY,EAAE,WAAW,QAAQ,CAAC;AAAA,IAC/D;AAAA,EAGF,GAAG,CAAC,WAAW,OAAO,CAAC;AAEvB,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU;AAAA,IACV,aACE,mDAAC;AAAA,MAAK,OAAM;AAAA,MAAQ,eAAa,6BAAY;AAAA,OAC3C,mDAAC;AAAA,MAAK,GAAE;AAAA,MAAM,OAAO,EAAE,YAAY,QAAQ;AAAA,OACzC,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,MACL,WAAS;AAAA,KACX,CACF,GACA,mDAAC;AAAA,MACC,WAAW,CAAC,MACV,EAAE,SAAS,WACX,WAAW,MAAM,+BAA+B,IAAI,CAAC,CAAE,WAAU,aAAa,UAAU,QAAQ,GAAG,CAAC;AAAA,OAGtG,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,KACP,CACF,CACF;AAAA,IAEF,aAAa,mDAAC,iCAAY;AAAA,IAC1B;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
+  "sourcesContent": ["import React, { useEffect, useCallback, useRef, useState } from 'react';\nimport { DatePicker2 } from '@elliemae/ds-icons';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSControlledDateRangePicker } from '@elliemae/ds-controlled-form';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst emptyFilterValue = { startDate: null, endDate: null };\n\nexport const DateRangeFilter: React.ComponentType<FilterProps> = (props) => {\n  const {\n    column,\n    column: { id },\n    filterValue = emptyFilterValue,\n    onValueChange,\n    patchHeaderFilterButtonAndMenu,\n    reduxHeader,\n    innerRef,\n  } = props;\n\n  const dateRange = filterValue;\n\n  const [startDate, setStartDate] = useState(dateRange.startDate || '');\n  const [endDate, setEndDate] = useState(dateRange.endDate || '');\n\n  useEffect(() => {\n    setStartDate(dateRange.startDate || '');\n    setEndDate(dateRange.endDate || '');\n  }, [dateRange]);\n\n  useEffect(() => {\n    if (startDate && endDate && !startDate.includes('_') && !endDate.includes('_')) {\n      onValueChange(FILTER_TYPES.DATE_RANGE, { startDate, endDate });\n    }\n    // We are missing onValueChange on purpose, this is an internal function and won't cause any problems\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [startDate, endDate]);\n\n  const ref = useRef();\n  const shouldFocus = useRef(true);\n  const handleRef = useCallback((newRef) => {\n    if (ref.current) ref.current = newRef;\n    if (shouldFocus.current) {\n      setTimeout(() => {\n        newRef?.focus();\n        shouldFocus.current = false;\n      });\n    }\n  }, []);\n\n  useEffect(() => {\n    if (reduxHeader?.hideFilterMenu) {\n      shouldFocus.current = true;\n    }\n  }, [reduxHeader?.hideFilterMenu]);\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={id}\n      menuContent={\n        <Grid width=\"260px\" data-testid={DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER}>\n          <Grid p=\"xxs\" style={{ background: 'white' }}>\n            <DSControlledDateRangePicker\n              fromDate={startDate}\n              onFromDateChange={setStartDate}\n              toDate={endDate}\n              onToDateChange={setEndDate}\n              type=\"date-range-inputs\"\n              innerRef={handleRef}\n            />\n          </Grid>\n          <Grid\n            onKeyDown={(e) =>\n              e.code === 'Enter' &&\n              setTimeout(() => patchHeaderFilterButtonAndMenu(id, !!(dateRange.startDate || dateRange.endDate)), 0)\n            }\n          >\n            <DSControlledDateRangePicker\n              fromDate={startDate}\n              onFromDateChange={setStartDate}\n              toDate={endDate}\n              onToDateChange={setEndDate}\n              type=\"date-range-picker-controller-only\"\n            />\n          </Grid>\n        </Grid>\n      }\n      triggerIcon={<DatePicker2 />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Date Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAgE;AAChE,sBAA4B;AAC5B,qBAAqB;AACrB,gCAA4C;AAC5C,8BAA4C;AAE5C,uBAA4B;AAE5B,MAAM,mBAAmB,EAAE,WAAW,MAAM,SAAS,KAAK;AAEnD,MAAM,kBAAoD,CAAC,UAAU;AAC1E,QAAM;AAAA,IACJ;AAAA,IACA,QAAQ,EAAE;AAAA,IACV,cAAc;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,YAAY;AAElB,QAAM,CAAC,WAAW,gBAAgB,2BAAS,UAAU,aAAa,EAAE;AACpE,QAAM,CAAC,SAAS,cAAc,2BAAS,UAAU,WAAW,EAAE;AAE9D,8BAAU,MAAM;AACd,iBAAa,UAAU,aAAa,EAAE;AACtC,eAAW,UAAU,WAAW,EAAE;AAAA,EACpC,GAAG,CAAC,SAAS,CAAC;AAEd,8BAAU,MAAM;AACd,QAAI,aAAa,WAAW,CAAC,UAAU,SAAS,GAAG,KAAK,CAAC,QAAQ,SAAS,GAAG,GAAG;AAC9E,oBAAc,qCAAa,YAAY,EAAE,WAAW,QAAQ,CAAC;AAAA,IAC/D;AAAA,EAGF,GAAG,CAAC,WAAW,OAAO,CAAC;AAEvB,QAAM,MAAM,yBAAO;AACnB,QAAM,cAAc,yBAAO,IAAI;AAC/B,QAAM,YAAY,8BAAY,CAAC,WAAW;AACxC,QAAI,IAAI;AAAS,UAAI,UAAU;AAC/B,QAAI,YAAY,SAAS;AACvB,iBAAW,MAAM;AACf,gBAAQ,MAAM;AACd,oBAAY,UAAU;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,8BAAU,MAAM;AACd,QAAI,aAAa,gBAAgB;AAC/B,kBAAY,UAAU;AAAA,IACxB;AAAA,EACF,GAAG,CAAC,aAAa,cAAc,CAAC;AAEhC,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU;AAAA,IACV,aACE,mDAAC;AAAA,MAAK,OAAM;AAAA,MAAQ,eAAa,6BAAY;AAAA,OAC3C,mDAAC;AAAA,MAAK,GAAE;AAAA,MAAM,OAAO,EAAE,YAAY,QAAQ;AAAA,OACzC,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,MACL,UAAU;AAAA,KACZ,CACF,GACA,mDAAC;AAAA,MACC,WAAW,CAAC,MACV,EAAE,SAAS,WACX,WAAW,MAAM,+BAA+B,IAAI,CAAC,CAAE,WAAU,aAAa,UAAU,QAAQ,GAAG,CAAC;AAAA,OAGtG,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,KACP,CACF,CACF;AAAA,IAEF,aAAa,mDAAC,iCAAY;AAAA,IAC1B;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
   "names": []
 }

package/dist/cjs/addons/Filters/Components/DateSwitcherFilter/index.js

@@ -42,6 +42,7 @@ const DateSwitcherFilter = (props) => {
     reduxHeader,
     innerRef
   } = props;
+  const ref = (0, import_react.useRef)();
   const dateRange = filterValue;
   const [startDate, setStartDate] = (0, import_react.useState)(dateRange.startDate || "");
   const [endDate, setEndDate] = (0, import_react.useState)(dateRange.endDate || "");
@@ -55,6 +56,13 @@ const DateSwitcherFilter = (props) => {
       onValueChange(import_exported_related.FILTER_TYPES.DATE_SWITCHER, { startDate, endDate, isDateRange });
     }
   }, [startDate, endDate, isDateRange]);
+  const handleRef = (0, import_react.useCallback)((newRef) => {
+    if (ref.current)
+      ref.current = newRef;
+    if (!reduxHeader?.hideFilterMenu) {
+      setTimeout(() => newRef?.focus());
+    }
+  }, [reduxHeader?.hideFilterMenu]);
   return /* @__PURE__ */ import_react.default.createElement(import_exported_related.FilterPopover, {
     reduxHeader,
     column,
@@ -78,7 +86,7 @@ const DateSwitcherFilter = (props) => {
         setStartDate("");
         setEndDate("");
       },
-      autoFocus: true
+      innerRef: handleRef
     })), isDateRange ? /* @__PURE__ */ import_react.default.createElement(import_ds_controlled_form.DSControlledDateRangePicker, {
       fromDate: startDate,
       onFromDateChange: setStartDate,

package/dist/cjs/addons/Filters/Components/DateSwitcherFilter/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/addons/Filters/Components/DateSwitcherFilter/index.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable max-lines */\nimport React, { useEffect, useState } from 'react';\nimport { DatePicker2 } from '@elliemae/ds-icons';\nimport { Grid } from '@elliemae/ds-grid';\nimport {\n  DSControlledDateRangePicker,\n  DSControlledDateTimePicker,\n  DSControlledCheckbox,\n} from '@elliemae/ds-controlled-form';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst emptyFilterValue = { startDate: null, endDate: null };\n\nexport const DateSwitcherFilter: React.ComponentType<FilterProps> = (props) => {\n  const {\n    column,\n    column: { id },\n    filterValue = emptyFilterValue,\n    onValueChange,\n    patchHeaderFilterButtonAndMenu,\n    reduxHeader,\n    innerRef,\n  } = props;\n\n  const dateRange = filterValue;\n\n  const [startDate, setStartDate] = useState(dateRange.startDate || '');\n  const [endDate, setEndDate] = useState(dateRange.endDate || '');\n  const [isDateRange, setIsDateRange] = useState(false);\n\n  useEffect(() => {\n    setStartDate(dateRange.startDate || '');\n    setEndDate(dateRange.endDate || '');\n  }, [dateRange]);\n\n  useEffect(() => {\n    if (startDate && endDate && !startDate.includes('_') && !endDate.includes('_')) {\n      onValueChange(FILTER_TYPES.DATE_SWITCHER, { startDate, endDate, isDateRange });\n    }\n    // We are missing onValueChange on purpose, this is an internal function and won't cause any problems\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [startDate, endDate, isDateRange]);\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={id}\n      menuContent={\n        <Grid width=\"260px\" data-testid={DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER}>\n          <Grid p=\"xxs\" gutter=\"xxs\" style={{ background: 'white' }}>\n            <div data-testid={DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER_CHECKBOX_SWITCHER}>\n              <DSControlledCheckbox\n                checked={isDateRange}\n                name=\"Date range\"\n                label=\"Date Range\"\n                id=\"date-range-switcher-id-internal\"\n                onChange={() => {\n                  setIsDateRange(!isDateRange);\n                  setStartDate('');\n                  setEndDate('');\n                }}\n                autoFocus\n              />\n            </div>\n            {isDateRange ? (\n              <DSControlledDateRangePicker\n                fromDate={startDate}\n                onFromDateChange={setStartDate}\n                toDate={endDate}\n                onToDateChange={setEndDate}\n                type=\"date-range-inputs\"\n              />\n            ) : (\n              <DSControlledDateTimePicker\n                date={startDate}\n                onDateChange={(_date) => {\n                  setStartDate(_date);\n                  setEndDate(_date);\n                }}\n                type=\"date-inputs\"\n              />\n            )}\n          </Grid>\n          <Grid\n            onKeyDown={(e) =>\n              e.code === 'Enter' &&\n              setTimeout(() => patchHeaderFilterButtonAndMenu(id, !!(dateRange.startDate || dateRange.endDate)), 0)\n            }\n          >\n            {isDateRange ? (\n              <DSControlledDateRangePicker\n                fromDate={startDate}\n                onFromDateChange={setStartDate}\n                toDate={endDate}\n                onToDateChange={setEndDate}\n                type=\"date-range-picker-controller-only\"\n              />\n            ) : (\n              <DSControlledDateTimePicker\n                date={startDate}\n                onDateChange={(_date) => {\n                  setStartDate(_date);\n                  setEndDate(_date);\n                }}\n                type=\"date-picker-controller-only\"\n              />\n            )}\n          </Grid>\n        </Grid>\n      }\n      triggerIcon={<DatePicker2 />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Date Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADCvB,mBAA2C;AAC3C,sBAA4B;AAC5B,qBAAqB;AACrB,gCAIO;AACP,8BAA4C;AAE5C,uBAA4B;AAE5B,MAAM,mBAAmB,EAAE,WAAW,MAAM,SAAS,KAAK;AAEnD,MAAM,qBAAuD,CAAC,UAAU;AAC7E,QAAM;AAAA,IACJ;AAAA,IACA,QAAQ,EAAE;AAAA,IACV,cAAc;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,YAAY;AAElB,QAAM,CAAC,WAAW,gBAAgB,2BAAS,UAAU,aAAa,EAAE;AACpE,QAAM,CAAC,SAAS,cAAc,2BAAS,UAAU,WAAW,EAAE;AAC9D,QAAM,CAAC,aAAa,kBAAkB,2BAAS,KAAK;AAEpD,8BAAU,MAAM;AACd,iBAAa,UAAU,aAAa,EAAE;AACtC,eAAW,UAAU,WAAW,EAAE;AAAA,EACpC,GAAG,CAAC,SAAS,CAAC;AAEd,8BAAU,MAAM;AACd,QAAI,aAAa,WAAW,CAAC,UAAU,SAAS,GAAG,KAAK,CAAC,QAAQ,SAAS,GAAG,GAAG;AAC9E,oBAAc,qCAAa,eAAe,EAAE,WAAW,SAAS,YAAY,CAAC;AAAA,IAC/E;AAAA,EAGF,GAAG,CAAC,WAAW,SAAS,WAAW,CAAC;AAEpC,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU;AAAA,IACV,aACE,mDAAC;AAAA,MAAK,OAAM;AAAA,MAAQ,eAAa,6BAAY;AAAA,OAC3C,mDAAC;AAAA,MAAK,GAAE;AAAA,MAAM,QAAO;AAAA,MAAM,OAAO,EAAE,YAAY,QAAQ;AAAA,OACtD,mDAAC;AAAA,MAAI,eAAa,6BAAY;AAAA,OAC5B,mDAAC;AAAA,MACC,SAAS;AAAA,MACT,MAAK;AAAA,MACL,OAAM;AAAA,MACN,IAAG;AAAA,MACH,UAAU,MAAM;AACd,uBAAe,CAAC,WAAW;AAC3B,qBAAa,EAAE;AACf,mBAAW,EAAE;AAAA,MACf;AAAA,MACA,WAAS;AAAA,KACX,CACF,GACC,cACC,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,KACP,IAEA,mDAAC;AAAA,MACC,MAAM;AAAA,MACN,cAAc,CAAC,UAAU;AACvB,qBAAa,KAAK;AAClB,mBAAW,KAAK;AAAA,MAClB;AAAA,MACA,MAAK;AAAA,KACP,CAEJ,GACA,mDAAC;AAAA,MACC,WAAW,CAAC,MACV,EAAE,SAAS,WACX,WAAW,MAAM,+BAA+B,IAAI,CAAC,CAAE,WAAU,aAAa,UAAU,QAAQ,GAAG,CAAC;AAAA,OAGrG,cACC,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,KACP,IAEA,mDAAC;AAAA,MACC,MAAM;AAAA,MACN,cAAc,CAAC,UAAU;AACvB,qBAAa,KAAK;AAClB,mBAAW,KAAK;AAAA,MAClB;AAAA,MACA,MAAK;AAAA,KACP,CAEJ,CACF;AAAA,IAEF,aAAa,mDAAC,iCAAY;AAAA,IAC1B;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
+  "sourcesContent": ["/* eslint-disable max-lines */\nimport React, { useEffect, useRef, useCallback, useState } from 'react';\nimport { DatePicker2 } from '@elliemae/ds-icons';\nimport { Grid } from '@elliemae/ds-grid';\nimport {\n  DSControlledDateRangePicker,\n  DSControlledDateTimePicker,\n  DSControlledCheckbox,\n} from '@elliemae/ds-controlled-form';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst emptyFilterValue = { startDate: null, endDate: null };\n\nexport const DateSwitcherFilter: React.ComponentType<FilterProps> = (props) => {\n  const {\n    column,\n    column: { id },\n    filterValue = emptyFilterValue,\n    onValueChange,\n    patchHeaderFilterButtonAndMenu,\n    reduxHeader,\n    innerRef,\n  } = props;\n\n  const ref = useRef();\n  const dateRange = filterValue;\n\n  const [startDate, setStartDate] = useState(dateRange.startDate || '');\n  const [endDate, setEndDate] = useState(dateRange.endDate || '');\n  const [isDateRange, setIsDateRange] = useState(false);\n\n  useEffect(() => {\n    setStartDate(dateRange.startDate || '');\n    setEndDate(dateRange.endDate || '');\n  }, [dateRange]);\n\n  useEffect(() => {\n    if (startDate && endDate && !startDate.includes('_') && !endDate.includes('_')) {\n      onValueChange(FILTER_TYPES.DATE_SWITCHER, { startDate, endDate, isDateRange });\n    }\n    // We are missing onValueChange on purpose, this is an internal function and won't cause any problems\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [startDate, endDate, isDateRange]);\n\n  const handleRef = useCallback(\n    (newRef) => {\n      if (ref.current) ref.current = newRef;\n      if (!reduxHeader?.hideFilterMenu) {\n        setTimeout(() => newRef?.focus());\n      }\n    },\n    [reduxHeader?.hideFilterMenu],\n  );\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={id}\n      menuContent={\n        <Grid width=\"260px\" data-testid={DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER}>\n          <Grid p=\"xxs\" gutter=\"xxs\" style={{ background: 'white' }}>\n            <div data-testid={DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER_CHECKBOX_SWITCHER}>\n              <DSControlledCheckbox\n                checked={isDateRange}\n                name=\"Date range\"\n                label=\"Date Range\"\n                id=\"date-range-switcher-id-internal\"\n                onChange={() => {\n                  setIsDateRange(!isDateRange);\n                  setStartDate('');\n                  setEndDate('');\n                }}\n                innerRef={handleRef}\n              />\n            </div>\n            {isDateRange ? (\n              <DSControlledDateRangePicker\n                fromDate={startDate}\n                onFromDateChange={setStartDate}\n                toDate={endDate}\n                onToDateChange={setEndDate}\n                type=\"date-range-inputs\"\n              />\n            ) : (\n              <DSControlledDateTimePicker\n                date={startDate}\n                onDateChange={(_date) => {\n                  setStartDate(_date);\n                  setEndDate(_date);\n                }}\n                type=\"date-inputs\"\n              />\n            )}\n          </Grid>\n          <Grid\n            onKeyDown={(e) =>\n              e.code === 'Enter' &&\n              setTimeout(() => patchHeaderFilterButtonAndMenu(id, !!(dateRange.startDate || dateRange.endDate)), 0)\n            }\n          >\n            {isDateRange ? (\n              <DSControlledDateRangePicker\n                fromDate={startDate}\n                onFromDateChange={setStartDate}\n                toDate={endDate}\n                onToDateChange={setEndDate}\n                type=\"date-range-picker-controller-only\"\n              />\n            ) : (\n              <DSControlledDateTimePicker\n                date={startDate}\n                onDateChange={(_date) => {\n                  setStartDate(_date);\n                  setEndDate(_date);\n                }}\n                type=\"date-picker-controller-only\"\n              />\n            )}\n          </Grid>\n        </Grid>\n      }\n      triggerIcon={<DatePicker2 />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Date Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADCvB,mBAAgE;AAChE,sBAA4B;AAC5B,qBAAqB;AACrB,gCAIO;AACP,8BAA4C;AAE5C,uBAA4B;AAE5B,MAAM,mBAAmB,EAAE,WAAW,MAAM,SAAS,KAAK;AAEnD,MAAM,qBAAuD,CAAC,UAAU;AAC7E,QAAM;AAAA,IACJ;AAAA,IACA,QAAQ,EAAE;AAAA,IACV,cAAc;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,MAAM,yBAAO;AACnB,QAAM,YAAY;AAElB,QAAM,CAAC,WAAW,gBAAgB,2BAAS,UAAU,aAAa,EAAE;AACpE,QAAM,CAAC,SAAS,cAAc,2BAAS,UAAU,WAAW,EAAE;AAC9D,QAAM,CAAC,aAAa,kBAAkB,2BAAS,KAAK;AAEpD,8BAAU,MAAM;AACd,iBAAa,UAAU,aAAa,EAAE;AACtC,eAAW,UAAU,WAAW,EAAE;AAAA,EACpC,GAAG,CAAC,SAAS,CAAC;AAEd,8BAAU,MAAM;AACd,QAAI,aAAa,WAAW,CAAC,UAAU,SAAS,GAAG,KAAK,CAAC,QAAQ,SAAS,GAAG,GAAG;AAC9E,oBAAc,qCAAa,eAAe,EAAE,WAAW,SAAS,YAAY,CAAC;AAAA,IAC/E;AAAA,EAGF,GAAG,CAAC,WAAW,SAAS,WAAW,CAAC;AAEpC,QAAM,YAAY,8BAChB,CAAC,WAAW;AACV,QAAI,IAAI;AAAS,UAAI,UAAU;AAC/B,QAAI,CAAC,aAAa,gBAAgB;AAChC,iBAAW,MAAM,QAAQ,MAAM,CAAC;AAAA,IAClC;AAAA,EACF,GACA,CAAC,aAAa,cAAc,CAC9B;AAEA,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU;AAAA,IACV,aACE,mDAAC;AAAA,MAAK,OAAM;AAAA,MAAQ,eAAa,6BAAY;AAAA,OAC3C,mDAAC;AAAA,MAAK,GAAE;AAAA,MAAM,QAAO;AAAA,MAAM,OAAO,EAAE,YAAY,QAAQ;AAAA,OACtD,mDAAC;AAAA,MAAI,eAAa,6BAAY;AAAA,OAC5B,mDAAC;AAAA,MACC,SAAS;AAAA,MACT,MAAK;AAAA,MACL,OAAM;AAAA,MACN,IAAG;AAAA,MACH,UAAU,MAAM;AACd,uBAAe,CAAC,WAAW;AAC3B,qBAAa,EAAE;AACf,mBAAW,EAAE;AAAA,MACf;AAAA,MACA,UAAU;AAAA,KACZ,CACF,GACC,cACC,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,KACP,IAEA,mDAAC;AAAA,MACC,MAAM;AAAA,MACN,cAAc,CAAC,UAAU;AACvB,qBAAa,KAAK;AAClB,mBAAW,KAAK;AAAA,MAClB;AAAA,MACA,MAAK;AAAA,KACP,CAEJ,GACA,mDAAC;AAAA,MACC,WAAW,CAAC,MACV,EAAE,SAAS,WACX,WAAW,MAAM,+BAA+B,IAAI,CAAC,CAAE,WAAU,aAAa,UAAU,QAAQ,GAAG,CAAC;AAAA,OAGrG,cACC,mDAAC;AAAA,MACC,UAAU;AAAA,MACV,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAgB;AAAA,MAChB,MAAK;AAAA,KACP,IAEA,mDAAC;AAAA,MACC,MAAM;AAAA,MACN,cAAc,CAAC,UAAU;AACvB,qBAAa,KAAK;AAClB,mBAAW,KAAK;AAAA,MAClB;AAAA,MACA,MAAK;AAAA,KACP,CAEJ,CACF;AAAA,IAEF,aAAa,mDAAC,iCAAY;AAAA,IAC1B;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
   "names": []
 }

package/dist/cjs/addons/Filters/Components/NumberRangeFilter/index.js

@@ -65,6 +65,14 @@ const NumberRangeFilter = (props) => {
     }
   };
   const idPreffix = "datatable-number-range";
+  const ref = (0, import_react.useRef)();
+  const handleRef = (0, import_react.useCallback)((newRef) => {
+    if (ref.current)
+      ref.current = newRef;
+    if (!reduxHeader?.hideFilterMenu) {
+      setTimeout(() => newRef?.focus());
+    }
+  }, [reduxHeader?.hideFilterMenu]);
   return /* @__PURE__ */ import_react.default.createElement(import_exported_related.FilterPopover, {
     reduxHeader,
     column,
@@ -85,7 +93,7 @@ const NumberRangeFilter = (props) => {
       onChange: handleFromChange,
       placeholder: "0",
       mask: (number) => import_ds_form.MASK_TYPES.NUMBER(opts)(number),
-      autoFocus: true,
+      innerRef: handleRef,
       onKeyDown: (e) => {
         closePopover(e);
       }

package/dist/cjs/addons/Filters/Components/NumberRangeFilter/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/addons/Filters/Components/NumberRangeFilter/index.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React from 'react';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSInputMask, MASK_TYPES } from '@elliemae/ds-form';\nimport { DSFormLayoutBlockItem } from '@elliemae/ds-form-layout-blocks';\nimport { SearchXsmall } from '@elliemae/ds-icons';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst opts = {\n  prefix: '',\n  suffix: '',\n  allowDecimal: false,\n  includeThousandsSeparator: false,\n  requireDecimal: false,\n  allowNegative: true,\n};\n\nexport const NumberRangeFilter: React.ComponentType<FilterProps> = (props) => {\n  const { column, filterValue = { from: null, to: null }, reduxHeader, patchHeader, onValueChange, innerRef } = props;\n\n  const handleFromChange = (e) => {\n    const from = e.target.value !== '' ? parseInt(e.target.value, 10) : '';\n    const nextValue = {\n      ...filterValue,\n      from,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n  const handleToChange = (e) => {\n    const to = e.target.value !== '' ? parseInt(e.target.value, 10) : '';\n    const nextValue = {\n      ...filterValue,\n      to,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n\n  // workaround to close menu with esc key since DSInputMask has stoppropagation on key down\n  const closePopover = (e) => {\n    if (e.code === 'Escape') {\n      patchHeader(column.id, { hideFilterMenu: true, hideFilterButton: false });\n      innerRef.current.focus();\n    }\n  };\n  const idPreffix = 'datatable-number-range';\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={\n        <Grid\n          data-testid={DATA_TESTID.DATA_TABLE_NUMBER_RANGE_CONTROLLER}\n          gutter=\"xxxs\"\n          padding=\"xxs\"\n          cols={['auto', 'auto']}\n          style={{ background: 'white' }}\n        >\n          <DSFormLayoutBlockItem label=\"Low\" inputID={`${idPreffix}-low-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-low-${column.id}`}\n              value={`${filterValue?.from ?? ''}`}\n              onChange={handleFromChange}\n              placeholder=\"0\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              autoFocus\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n          <DSFormLayoutBlockItem label=\"High\" inputID={`${idPreffix}-high-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-high-${column.id}`}\n              value={`${filterValue?.to ?? ''}`}\n              onChange={handleToChange}\n              placeholder=\"0\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n        </Grid>\n      }\n      triggerIcon={<SearchXsmall />}\n      customStyles={{ width: column.ref?.current?.offsetWidth ?? '0px' }}\n      innerRef={innerRef}\n      ariaLabel=\"Open Number Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAkB;AAClB,qBAAqB;AACrB,qBAAwC;AACxC,mCAAsC;AACtC,sBAA6B;AAC7B,8BAA4C;AAE5C,uBAA4B;AAE5B,MAAM,OAAO;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,cAAc;AAAA,EACd,2BAA2B;AAAA,EAC3B,gBAAgB;AAAA,EAChB,eAAe;AACjB;AAEO,MAAM,oBAAsD,CAAC,UAAU;AAC5E,QAAM,EAAE,QAAQ,cAAc,EAAE,MAAM,MAAM,IAAI,KAAK,GAAG,aAAa,aAAa,eAAe,aAAa;AAE9G,QAAM,mBAAmB,CAAC,MAAM;AAC9B,UAAM,OAAO,EAAE,OAAO,UAAU,KAAK,SAAS,EAAE,OAAO,OAAO,EAAE,IAAI;AACpE,UAAM,YAAY;AAAA,MAChB,GAAG;AAAA,MACH;AAAA,IACF;AACA,kBAAc,qCAAa,gBAAgB,SAAS;AAAA,EACtD;AACA,QAAM,iBAAiB,CAAC,MAAM;AAC5B,UAAM,KAAK,EAAE,OAAO,UAAU,KAAK,SAAS,EAAE,OAAO,OAAO,EAAE,IAAI;AAClE,UAAM,YAAY;AAAA,MAChB,GAAG;AAAA,MACH;AAAA,IACF;AACA,kBAAc,qCAAa,gBAAgB,SAAS;AAAA,EACtD;AAGA,QAAM,eAAe,CAAC,MAAM;AAC1B,QAAI,EAAE,SAAS,UAAU;AACvB,kBAAY,OAAO,IAAI,EAAE,gBAAgB,MAAM,kBAAkB,MAAM,CAAC;AACxE,eAAS,QAAQ,MAAM;AAAA,IACzB;AAAA,EACF;AACA,QAAM,YAAY;AAClB,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU,OAAO;AAAA,IACjB,aACE,mDAAC;AAAA,MACC,eAAa,6BAAY;AAAA,MACzB,QAAO;AAAA,MACP,SAAQ;AAAA,MACR,MAAM,CAAC,QAAQ,MAAM;AAAA,MACrB,OAAO,EAAE,YAAY,QAAQ;AAAA,OAE7B,mDAAC;AAAA,MAAsB,OAAM;AAAA,MAAM,SAAS,GAAG,iBAAiB,OAAO;AAAA,OACrE,mDAAC;AAAA,MACC,gBAAgB,EAAE,OAAO,EAAE,WAAW,QAAQ,EAAE;AAAA,MAChD,IAAI,GAAG,iBAAiB,OAAO;AAAA,MAC/B,OAAO,GAAG,aAAa,QAAQ;AAAA,MAC/B,UAAU;AAAA,MACV,aAAY;AAAA,MACZ,MAAM,CAAC,WAAW,0BAAW,OAAO,IAAI,EAAE,MAAM;AAAA,MAChD,WAAS;AAAA,MACT,WAAW,CAAC,MAAM;AAChB,qBAAa,CAAC;AAAA,MAChB;AAAA,KACF,CACF,GACA,mDAAC;AAAA,MAAsB,OAAM;AAAA,MAAO,SAAS,GAAG,kBAAkB,OAAO;AAAA,OACvE,mDAAC;AAAA,MACC,gBAAgB,EAAE,OAAO,EAAE,WAAW,QAAQ,EAAE;AAAA,MAChD,IAAI,GAAG,kBAAkB,OAAO;AAAA,MAChC,OAAO,GAAG,aAAa,MAAM;AAAA,MAC7B,UAAU;AAAA,MACV,aAAY;AAAA,MACZ,MAAM,CAAC,WAAW,0BAAW,OAAO,IAAI,EAAE,MAAM;AAAA,MAChD,WAAW,CAAC,MAAM;AAChB,qBAAa,CAAC;AAAA,MAChB;AAAA,KACF,CACF,CACF;AAAA,IAEF,aAAa,mDAAC,kCAAa;AAAA,IAC3B,cAAc,EAAE,OAAO,OAAO,KAAK,SAAS,eAAe,MAAM;AAAA,IACjE;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
+  "sourcesContent": ["import React, { useRef, useCallback } from 'react';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSInputMask, MASK_TYPES } from '@elliemae/ds-form';\nimport { DSFormLayoutBlockItem } from '@elliemae/ds-form-layout-blocks';\nimport { SearchXsmall } from '@elliemae/ds-icons';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nconst opts = {\n  prefix: '',\n  suffix: '',\n  allowDecimal: false,\n  includeThousandsSeparator: false,\n  requireDecimal: false,\n  allowNegative: true,\n};\n\nexport const NumberRangeFilter: React.ComponentType<FilterProps> = (props) => {\n  const { column, filterValue = { from: null, to: null }, reduxHeader, patchHeader, onValueChange, innerRef } = props;\n\n  const handleFromChange = (e) => {\n    const from = e.target.value !== '' ? parseInt(e.target.value, 10) : '';\n    const nextValue = {\n      ...filterValue,\n      from,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n  const handleToChange = (e) => {\n    const to = e.target.value !== '' ? parseInt(e.target.value, 10) : '';\n    const nextValue = {\n      ...filterValue,\n      to,\n    };\n    onValueChange(FILTER_TYPES.CURRENCY_RANGE, nextValue);\n  };\n\n  // workaround to close menu with esc key since DSInputMask has stoppropagation on key down\n  const closePopover = (e) => {\n    if (e.code === 'Escape') {\n      patchHeader(column.id, { hideFilterMenu: true, hideFilterButton: false });\n      innerRef.current.focus();\n    }\n  };\n  const idPreffix = 'datatable-number-range';\n\n  const ref = useRef();\n  const handleRef = useCallback(\n    (newRef) => {\n      if (ref.current) ref.current = newRef;\n      if (!reduxHeader?.hideFilterMenu) {\n        setTimeout(() => newRef?.focus());\n      }\n    },\n    [reduxHeader?.hideFilterMenu],\n  );\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={\n        <Grid\n          data-testid={DATA_TESTID.DATA_TABLE_NUMBER_RANGE_CONTROLLER}\n          gutter=\"xxxs\"\n          padding=\"xxs\"\n          cols={['auto', 'auto']}\n          style={{ background: 'white' }}\n        >\n          <DSFormLayoutBlockItem label=\"Low\" inputID={`${idPreffix}-low-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-low-${column.id}`}\n              value={`${filterValue?.from ?? ''}`}\n              onChange={handleFromChange}\n              placeholder=\"0\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              innerRef={handleRef}\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n          <DSFormLayoutBlockItem label=\"High\" inputID={`${idPreffix}-high-${column.id}`}>\n            <DSInputMask\n              containerProps={{ style: { textAlign: 'right' } }}\n              id={`${idPreffix}-high-${column.id}`}\n              value={`${filterValue?.to ?? ''}`}\n              onChange={handleToChange}\n              placeholder=\"0\"\n              mask={(number) => MASK_TYPES.NUMBER(opts)(number)}\n              onKeyDown={(e) => {\n                closePopover(e);\n              }}\n            />\n          </DSFormLayoutBlockItem>\n        </Grid>\n      }\n      triggerIcon={<SearchXsmall />}\n      customStyles={{ width: column.ref?.current?.offsetWidth ?? '0px' }}\n      innerRef={innerRef}\n      ariaLabel=\"Open Number Range Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/addons/Filters/Components/SelectFilter/BaseSelectFilter.js

@@ -48,6 +48,7 @@ const BaseSelectFilter = (props) => {
     innerRef,
     onValueChange
   } = props;
+  const ref = (0, import_react.useRef)();
   const filterOptions = (0, import_react.useMemo)(() => {
     if (!userFilterOptions) {
       const automaticFilters = [
@@ -88,21 +89,23 @@ const BaseSelectFilter = (props) => {
     handleOnChange(Array.isArray(selectedItems) ? [...selectedItems, newItem] : newItem);
     setFilteredOptions(filterOptions);
   };
-  (0, import_react.useEffect)(() => {
-    setFilteredOptions(filterOptions);
-  }, [filterOptions]);
+  const handleRef = (0, import_react.useCallback)((newRef) => {
+    if (ref.current)
+      ref.current = newRef;
+    if (!reduxHeader?.hideFilterMenu) {
+      setTimeout(() => newRef?.focus());
+    }
+  }, [reduxHeader?.hideFilterMenu]);
   const Select = /* @__PURE__ */ import_react.default.createElement(import_ds_grid.Grid, {
     "data-testid": isMulti ? import_configs.DATA_TESTID.DATA_TABLE_MULTISELECT_CONTROLLER : import_configs.DATA_TESTID.DATA_TABLE_SINGLESELECT_CONTROLLER,
     style: { background: "#fff", position: "relative", width: filterMinWidth ?? column.ref?.current?.offsetWidth }
   }, /* @__PURE__ */ import_react.default.createElement(import_ds_controlled_form.DSComboBox, {
     inline: true,
-    autoFocus: true,
-    allOptions: filterOptions,
+    innerRef: handleRef,
+    allOptions: filters,
     onCreate: creatable ? handleOnCreate : void 0,
-    filteredOptions: filters,
     onChange: handleOnChange,
     selectedValues: selectedItems,
-    onFilter: setFilteredOptions,
     menuMaxHeight: 300
   }));
   const handleOnClickOutside = () => {

package/dist/cjs/addons/Filters/Components/SelectFilter/BaseSelectFilter.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/addons/Filters/Components/SelectFilter/BaseSelectFilter.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useState, useEffect, useMemo } from 'react';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSComboBox } from '@elliemae/ds-controlled-form';\nimport { SearchXsmall } from '@elliemae/ds-icons';\nimport { uid } from 'uid';\nimport { FilterPopover } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs';\n\ninterface FilterOptionT {\n  dsId: string;\n  type: string;\n  value: string;\n  label: string;\n}\n\ninterface BaseSelectProps {\n  isMulti?: boolean;\n  creatable?: boolean;\n  selectedItems?: FilterOptionT[] | FilterOptionT;\n  type: string;\n}\n\nexport const BaseSelectFilter: React.ComponentType<FilterProps & BaseSelectProps> = (props) => {\n  const {\n    isMulti = false,\n    selectedItems = null,\n    creatable = false,\n    column,\n    type,\n    column: { id, filterOptions: userFilterOptions, filterMinWidth },\n    ctx: {\n      tableProps: { data },\n    },\n    reduxHeader,\n    patchHeaderFilterButtonAndMenu,\n    innerRef,\n    onValueChange,\n  } = props;\n\n  const filterOptions: FilterOptionT[] = useMemo(() => {\n    // If the user didn't provide options, use the available ones\n    if (!userFilterOptions) {\n      const automaticFilters = [\n        ...new Set(data.map((datum) => datum?.[id]?.toString()).filter((val) => val !== undefined)),\n      ].map((item) => ({\n        type: 'option',\n        dsId: item,\n        value: item,\n        label: item,\n      }));\n\n      return automaticFilters;\n    }\n\n    // If user provided the array itself, use it\n    if (Array.isArray(userFilterOptions)) return userFilterOptions;\n    // Otherwise, it is a function\n    return userFilterOptions();\n  }, [data, id, userFilterOptions]);\n\n  const [filters, setFilteredOptions] = useState(filterOptions);\n\n  const handleOnChange = (value) => {\n    onValueChange(type, value);\n    if (!isMulti) patchHeaderFilterButtonAndMenu(column.id, true);\n  };\n\n  const handleOnCreate = (label: string) => {\n    if (label.trim() === '') {\n      return;\n    }\n    if (filterOptions.some((item) => item.label === label)) {\n      return;\n    }\n    const newId = uid();\n    const newItem = {\n      dsId: newId,\n      value: newId,\n      label,\n      type: 'option',\n    };\n    filterOptions.unshift(newItem);\n    handleOnChange(Array.isArray(selectedItems) ? [...selectedItems, newItem] : newItem);\n    setFilteredOptions(filterOptions);\n  };\n\n  useEffect(() => {\n    setFilteredOptions(filterOptions);\n  }, [filterOptions]);\n\n  const Select = (\n    <Grid\n      data-testid={\n        isMulti ? DATA_TESTID.DATA_TABLE_MULTISELECT_CONTROLLER : DATA_TESTID.DATA_TABLE_SINGLESELECT_CONTROLLER\n      }\n      style={{ background: '#fff', position: 'relative', width: filterMinWidth ?? column.ref?.current?.offsetWidth }}\n    >\n      <DSComboBox\n        inline\n        autoFocus\n        allOptions={filterOptions}\n        onCreate={creatable ? handleOnCreate : undefined}\n        filteredOptions={filters}\n        onChange={handleOnChange}\n        selectedValues={selectedItems}\n        onFilter={setFilteredOptions}\n        menuMaxHeight={300}\n      />\n    </Grid>\n  );\n\n  const handleOnClickOutside = () => {\n    setFilteredOptions(filterOptions);\n  };\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={Select}\n      triggerIcon={<SearchXsmall />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Selection Filter\"\n      onClickOutsideMenu={handleOnClickOutside}\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAoD;AACpD,qBAAqB;AACrB,gCAA2B;AAC3B,sBAA6B;AAC7B,iBAAoB;AACpB,8BAA8B;AAE9B,qBAA4B;AAgBrB,MAAM,mBAAuE,CAAC,UAAU;AAC7F,QAAM;AAAA,IACJ,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA,QAAQ,EAAE,IAAI,eAAe,mBAAmB;AAAA,IAChD,KAAK;AAAA,MACH,YAAY,EAAE;AAAA;AAAA,IAEhB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,gBAAiC,0BAAQ,MAAM;AAEnD,QAAI,CAAC,mBAAmB;AACtB,YAAM,mBAAmB;AAAA,QACvB,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,UAAU,QAAQ,KAAK,SAAS,CAAC,EAAE,OAAO,CAAC,QAAQ,QAAQ,MAAS,CAAC;AAAA,MAC5F,EAAE,IAAI,CAAC,SAAU;AAAA,QACf,MAAM;AAAA,QACN,MAAM;AAAA,QACN,OAAO;AAAA,QACP,OAAO;AAAA,MACT,EAAE;AAEF,aAAO;AAAA,IACT;AAGA,QAAI,MAAM,QAAQ,iBAAiB;AAAG,aAAO;AAE7C,WAAO,kBAAkB;AAAA,EAC3B,GAAG,CAAC,MAAM,IAAI,iBAAiB,CAAC;AAEhC,QAAM,CAAC,SAAS,sBAAsB,2BAAS,aAAa;AAE5D,QAAM,iBAAiB,CAAC,UAAU;AAChC,kBAAc,MAAM,KAAK;AACzB,QAAI,CAAC;AAAS,qCAA+B,OAAO,IAAI,IAAI;AAAA,EAC9D;AAEA,QAAM,iBAAiB,CAAC,UAAkB;AACxC,QAAI,MAAM,KAAK,MAAM,IAAI;AACvB;AAAA,IACF;AACA,QAAI,cAAc,KAAK,CAAC,SAAS,KAAK,UAAU,KAAK,GAAG;AACtD;AAAA,IACF;AACA,UAAM,QAAQ,oBAAI;AAClB,UAAM,UAAU;AAAA,MACd,MAAM;AAAA,MACN,OAAO;AAAA,MACP;AAAA,MACA,MAAM;AAAA,IACR;AACA,kBAAc,QAAQ,OAAO;AAC7B,mBAAe,MAAM,QAAQ,aAAa,IAAI,CAAC,GAAG,eAAe,OAAO,IAAI,OAAO;AACnF,uBAAmB,aAAa;AAAA,EAClC;AAEA,8BAAU,MAAM;AACd,uBAAmB,aAAa;AAAA,EAClC,GAAG,CAAC,aAAa,CAAC;AAElB,QAAM,SACJ,mDAAC;AAAA,IACC,eACE,UAAU,2BAAY,oCAAoC,2BAAY;AAAA,IAExE,OAAO,EAAE,YAAY,QAAQ,UAAU,YAAY,OAAO,kBAAkB,OAAO,KAAK,SAAS,YAAY;AAAA,KAE7G,mDAAC;AAAA,IACC,QAAM;AAAA,IACN,WAAS;AAAA,IACT,YAAY;AAAA,IACZ,UAAU,YAAY,iBAAiB;AAAA,IACvC,iBAAiB;AAAA,IACjB,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,UAAU;AAAA,IACV,eAAe;AAAA,GACjB,CACF;AAGF,QAAM,uBAAuB,MAAM;AACjC,uBAAmB,aAAa;AAAA,EAClC;AACA,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU,OAAO;AAAA,IACjB,aAAa;AAAA,IACb,aAAa,mDAAC,kCAAa;AAAA,IAC3B;AAAA,IACA,WAAU;AAAA,IACV,oBAAoB;AAAA,GACtB;AAEJ;",
+  "sourcesContent": ["import React, { useState, useRef, useCallback, useEffect, useMemo } from 'react';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSComboBox } from '@elliemae/ds-controlled-form';\nimport { SearchXsmall } from '@elliemae/ds-icons';\nimport { uid } from 'uid';\nimport { FilterPopover } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs';\n\ninterface FilterOptionT {\n  dsId: string;\n  type: string;\n  value: string;\n  label: string;\n}\n\ninterface BaseSelectProps {\n  isMulti?: boolean;\n  creatable?: boolean;\n  selectedItems?: FilterOptionT[] | FilterOptionT;\n  type: string;\n}\n\nexport const BaseSelectFilter: React.ComponentType<FilterProps & BaseSelectProps> = (props) => {\n  const {\n    isMulti = false,\n    selectedItems = null,\n    creatable = false,\n    column,\n    type,\n    column: { id, filterOptions: userFilterOptions, filterMinWidth },\n    ctx: {\n      tableProps: { data },\n    },\n    reduxHeader,\n    patchHeaderFilterButtonAndMenu,\n    innerRef,\n    onValueChange,\n  } = props;\n\n  const ref = useRef();\n  const filterOptions: FilterOptionT[] = useMemo(() => {\n    // If the user didn't provide options, use the available ones\n    if (!userFilterOptions) {\n      const automaticFilters = [\n        ...new Set(data.map((datum) => datum?.[id]?.toString()).filter((val) => val !== undefined)),\n      ].map((item) => ({\n        type: 'option',\n        dsId: item,\n        value: item,\n        label: item,\n      }));\n\n      return automaticFilters;\n    }\n\n    // If user provided the array itself, use it\n    if (Array.isArray(userFilterOptions)) return userFilterOptions;\n    // Otherwise, it is a function\n    return userFilterOptions();\n  }, [data, id, userFilterOptions]);\n\n  const [filters, setFilteredOptions] = useState(filterOptions);\n\n  const handleOnChange = (value) => {\n    onValueChange(type, value);\n    if (!isMulti) patchHeaderFilterButtonAndMenu(column.id, true);\n  };\n\n  const handleOnCreate = (label: string) => {\n    if (label.trim() === '') {\n      return;\n    }\n    if (filterOptions.some((item) => item.label === label)) {\n      return;\n    }\n    const newId = uid();\n    const newItem = {\n      dsId: newId,\n      value: newId,\n      label,\n      type: 'option',\n    };\n    filterOptions.unshift(newItem);\n    handleOnChange(Array.isArray(selectedItems) ? [...selectedItems, newItem] : newItem);\n    setFilteredOptions(filterOptions);\n  };\n\n  const handleRef = useCallback(\n    (newRef) => {\n      if (ref.current) ref.current = newRef;\n      if (!reduxHeader?.hideFilterMenu) {\n        setTimeout(() => newRef?.focus());\n      }\n    },\n    [reduxHeader?.hideFilterMenu],\n  );\n\n  const Select = (\n    <Grid\n      data-testid={\n        isMulti ? DATA_TESTID.DATA_TABLE_MULTISELECT_CONTROLLER : DATA_TESTID.DATA_TABLE_SINGLESELECT_CONTROLLER\n      }\n      style={{ background: '#fff', position: 'relative', width: filterMinWidth ?? column.ref?.current?.offsetWidth }}\n    >\n      <DSComboBox\n        inline\n        innerRef={handleRef}\n        allOptions={filters}\n        onCreate={creatable ? handleOnCreate : undefined}\n        onChange={handleOnChange}\n        selectedValues={selectedItems}\n        menuMaxHeight={300}\n      />\n    </Grid>\n  );\n\n  const handleOnClickOutside = () => {\n    setFilteredOptions(filterOptions);\n  };\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={Select}\n      triggerIcon={<SearchXsmall />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Selection Filter\"\n      onClickOutsideMenu={handleOnClickOutside}\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAyE;AACzE,qBAAqB;AACrB,gCAA2B;AAC3B,sBAA6B;AAC7B,iBAAoB;AACpB,8BAA8B;AAE9B,qBAA4B;AAgBrB,MAAM,mBAAuE,CAAC,UAAU;AAC7F,QAAM;AAAA,IACJ,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA,QAAQ,EAAE,IAAI,eAAe,mBAAmB;AAAA,IAChD,KAAK;AAAA,MACH,YAAY,EAAE;AAAA;AAAA,IAEhB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,MAAM,yBAAO;AACnB,QAAM,gBAAiC,0BAAQ,MAAM;AAEnD,QAAI,CAAC,mBAAmB;AACtB,YAAM,mBAAmB;AAAA,QACvB,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,UAAU,QAAQ,KAAK,SAAS,CAAC,EAAE,OAAO,CAAC,QAAQ,QAAQ,MAAS,CAAC;AAAA,MAC5F,EAAE,IAAI,CAAC,SAAU;AAAA,QACf,MAAM;AAAA,QACN,MAAM;AAAA,QACN,OAAO;AAAA,QACP,OAAO;AAAA,MACT,EAAE;AAEF,aAAO;AAAA,IACT;AAGA,QAAI,MAAM,QAAQ,iBAAiB;AAAG,aAAO;AAE7C,WAAO,kBAAkB;AAAA,EAC3B,GAAG,CAAC,MAAM,IAAI,iBAAiB,CAAC;AAEhC,QAAM,CAAC,SAAS,sBAAsB,2BAAS,aAAa;AAE5D,QAAM,iBAAiB,CAAC,UAAU;AAChC,kBAAc,MAAM,KAAK;AACzB,QAAI,CAAC;AAAS,qCAA+B,OAAO,IAAI,IAAI;AAAA,EAC9D;AAEA,QAAM,iBAAiB,CAAC,UAAkB;AACxC,QAAI,MAAM,KAAK,MAAM,IAAI;AACvB;AAAA,IACF;AACA,QAAI,cAAc,KAAK,CAAC,SAAS,KAAK,UAAU,KAAK,GAAG;AACtD;AAAA,IACF;AACA,UAAM,QAAQ,oBAAI;AAClB,UAAM,UAAU;AAAA,MACd,MAAM;AAAA,MACN,OAAO;AAAA,MACP;AAAA,MACA,MAAM;AAAA,IACR;AACA,kBAAc,QAAQ,OAAO;AAC7B,mBAAe,MAAM,QAAQ,aAAa,IAAI,CAAC,GAAG,eAAe,OAAO,IAAI,OAAO;AACnF,uBAAmB,aAAa;AAAA,EAClC;AAEA,QAAM,YAAY,8BAChB,CAAC,WAAW;AACV,QAAI,IAAI;AAAS,UAAI,UAAU;AAC/B,QAAI,CAAC,aAAa,gBAAgB;AAChC,iBAAW,MAAM,QAAQ,MAAM,CAAC;AAAA,IAClC;AAAA,EACF,GACA,CAAC,aAAa,cAAc,CAC9B;AAEA,QAAM,SACJ,mDAAC;AAAA,IACC,eACE,UAAU,2BAAY,oCAAoC,2BAAY;AAAA,IAExE,OAAO,EAAE,YAAY,QAAQ,UAAU,YAAY,OAAO,kBAAkB,OAAO,KAAK,SAAS,YAAY;AAAA,KAE7G,mDAAC;AAAA,IACC,QAAM;AAAA,IACN,UAAU;AAAA,IACV,YAAY;AAAA,IACZ,UAAU,YAAY,iBAAiB;AAAA,IACvC,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,eAAe;AAAA,GACjB,CACF;AAGF,QAAM,uBAAuB,MAAM;AACjC,uBAAmB,aAAa;AAAA,EAClC;AACA,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU,OAAO;AAAA,IACjB,aAAa;AAAA,IACb,aAAa,mDAAC,kCAAa;AAAA,IAC3B;AAAA,IACA,WAAU;AAAA,IACV,oBAAoB;AAAA,GACtB;AAEJ;",
   "names": []
 }

package/dist/cjs/addons/Filters/Components/SingleDateFilter/index.js

@@ -52,6 +52,23 @@ const SingleDateFilter = (props) => {
   const commitDateChange = (0, import_react.useCallback)(() => {
     patchHeaderFilterButtonAndMenu(id, true);
   }, [id, patchHeaderFilterButtonAndMenu]);
+  const ref = (0, import_react.useRef)();
+  const shouldFocus = (0, import_react.useRef)(true);
+  const handleRef = (0, import_react.useCallback)((newRef) => {
+    if (ref.current)
+      ref.current = newRef;
+    if (shouldFocus.current) {
+      setTimeout(() => {
+        newRef?.focus();
+        shouldFocus.current = false;
+      });
+    }
+  }, []);
+  (0, import_react.useEffect)(() => {
+    if (reduxHeader?.hideFilterMenu) {
+      shouldFocus.current = true;
+    }
+  }, [reduxHeader?.hideFilterMenu]);
   return /* @__PURE__ */ import_react.default.createElement(import_exported_related.FilterPopover, {
     reduxHeader,
     column,
@@ -67,7 +84,7 @@ const SingleDateFilter = (props) => {
       onDateChange: setDate,
       type: "date-inputs",
       isClearable: true,
-      autoFocus: true
+      innerRef: handleRef
     })), /* @__PURE__ */ import_react.default.createElement(import_ds_grid.Grid, {
       onKeyDown: (e) => e.code === "Enter" && setTimeout(commitDateChange, 0)
     }, /* @__PURE__ */ import_react.default.createElement(import_ds_controlled_form.DSControlledDateTimePicker, {

package/dist/cjs/addons/Filters/Components/SingleDateFilter/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/addons/Filters/Components/SingleDateFilter/index.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useCallback, useEffect, useState } from 'react';\nimport { DatePicker2 } from '@elliemae/ds-icons';\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSControlledDateTimePicker } from '@elliemae/ds-controlled-form';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nexport const SingleDateFilter: React.ComponentType<FilterProps> = (props) => {\n  const {\n    column,\n    column: { id },\n    filterValue,\n    reduxHeader,\n    onValueChange,\n    patchHeaderFilterButtonAndMenu,\n    innerRef,\n  } = props;\n\n  const [date, setDate] = useState(filterValue || '');\n\n  useEffect(() => {\n    setDate(filterValue || '');\n  }, [filterValue]);\n\n  useEffect(() => {\n    if (!date.includes('_')) onValueChange(FILTER_TYPES.SINGLE_DATE, date || undefined);\n    // We are missing onValueChange on purpose, this is an internal function and won't cause any problems\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [date]);\n\n  const commitDateChange = useCallback(() => {\n    patchHeaderFilterButtonAndMenu(id, true);\n  }, [id, patchHeaderFilterButtonAndMenu]);\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={\n        <Grid data-testid={DATA_TESTID.DATA_TABLE_SINGLE_DATE_CONTROLLER} width=\"260px\">\n          <Grid p=\"xxs\" style={{ background: 'white' }}>\n            <DSControlledDateTimePicker date={date} onDateChange={setDate} type=\"date-inputs\" isClearable autoFocus />\n          </Grid>\n          <Grid onKeyDown={(e) => e.code === 'Enter' && setTimeout(commitDateChange, 0)}>\n            <DSControlledDateTimePicker date={date} onDateChange={setDate} type=\"date-picker-controller-only\" />\n          </Grid>\n        </Grid>\n      }\n      triggerIcon={<DatePicker2 />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Single Date Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAwD;AACxD,sBAA4B;AAC5B,qBAAqB;AACrB,gCAA2C;AAC3C,8BAA4C;AAE5C,uBAA4B;AAErB,MAAM,mBAAqD,CAAC,UAAU;AAC3E,QAAM;AAAA,IACJ;AAAA,IACA,QAAQ,EAAE;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,CAAC,MAAM,WAAW,2BAAS,eAAe,EAAE;AAElD,8BAAU,MAAM;AACd,YAAQ,eAAe,EAAE;AAAA,EAC3B,GAAG,CAAC,WAAW,CAAC;AAEhB,8BAAU,MAAM;AACd,QAAI,CAAC,KAAK,SAAS,GAAG;AAAG,oBAAc,qCAAa,aAAa,QAAQ,MAAS;AAAA,EAGpF,GAAG,CAAC,IAAI,CAAC;AAET,QAAM,mBAAmB,8BAAY,MAAM;AACzC,mCAA+B,IAAI,IAAI;AAAA,EACzC,GAAG,CAAC,IAAI,8BAA8B,CAAC;AAEvC,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU,OAAO;AAAA,IACjB,aACE,mDAAC;AAAA,MAAK,eAAa,6BAAY;AAAA,MAAmC,OAAM;AAAA,OACtE,mDAAC;AAAA,MAAK,GAAE;AAAA,MAAM,OAAO,EAAE,YAAY,QAAQ;AAAA,OACzC,mDAAC;AAAA,MAA2B;AAAA,MAAY,cAAc;AAAA,MAAS,MAAK;AAAA,MAAc,aAAW;AAAA,MAAC,WAAS;AAAA,KAAC,CAC1G,GACA,mDAAC;AAAA,MAAK,WAAW,CAAC,MAAM,EAAE,SAAS,WAAW,WAAW,kBAAkB,CAAC;AAAA,OAC1E,mDAAC;AAAA,MAA2B;AAAA,MAAY,cAAc;AAAA,MAAS,MAAK;AAAA,KAA8B,CACpG,CACF;AAAA,IAEF,aAAa,mDAAC,iCAAY;AAAA,IAC1B;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
+  "sourcesContent": ["import React, { useCallback, useMemo, useRef, useEffect, useState } from 'react';\nimport { DatePicker2 } from '@elliemae/ds-icons';\n\nimport { Grid } from '@elliemae/ds-grid';\nimport { DSControlledDateTimePicker } from '@elliemae/ds-controlled-form';\nimport { FilterPopover, FILTER_TYPES } from '../../../../exported-related';\nimport { FilterProps } from '../../../../types/props';\nimport { DATA_TESTID } from '../../../../configs/constants';\n\nexport const SingleDateFilter: React.ComponentType<FilterProps> = (props) => {\n  const {\n    column,\n    column: { id },\n    filterValue,\n    reduxHeader,\n    onValueChange,\n    patchHeaderFilterButtonAndMenu,\n    innerRef,\n  } = props;\n\n  const [date, setDate] = useState(filterValue || '');\n\n  useEffect(() => {\n    setDate(filterValue || '');\n  }, [filterValue]);\n\n  useEffect(() => {\n    if (!date.includes('_')) onValueChange(FILTER_TYPES.SINGLE_DATE, date || undefined);\n    // We are missing onValueChange on purpose, this is an internal function and won't cause any problems\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [date]);\n\n  const commitDateChange = useCallback(() => {\n    patchHeaderFilterButtonAndMenu(id, true);\n  }, [id, patchHeaderFilterButtonAndMenu]);\n\n  const ref = useRef();\n  const shouldFocus = useRef(true);\n  const handleRef = useCallback((newRef) => {\n    if (ref.current) ref.current = newRef;\n    if (shouldFocus.current) {\n      setTimeout(() => {\n        newRef?.focus();\n        shouldFocus.current = false;\n      });\n    }\n  }, []);\n\n  useEffect(() => {\n    if (reduxHeader?.hideFilterMenu) {\n      shouldFocus.current = true;\n    }\n  }, [reduxHeader?.hideFilterMenu]);\n\n  return (\n    <FilterPopover\n      reduxHeader={reduxHeader}\n      column={column}\n      columnId={column.id}\n      menuContent={\n        <Grid data-testid={DATA_TESTID.DATA_TABLE_SINGLE_DATE_CONTROLLER} width=\"260px\">\n          <Grid p=\"xxs\" style={{ background: 'white' }}>\n            <DSControlledDateTimePicker\n              date={date}\n              onDateChange={setDate}\n              type=\"date-inputs\"\n              isClearable\n              innerRef={handleRef}\n            />\n          </Grid>\n          <Grid onKeyDown={(e) => e.code === 'Enter' && setTimeout(commitDateChange, 0)}>\n            <DSControlledDateTimePicker date={date} onDateChange={setDate} type=\"date-picker-controller-only\" />\n          </Grid>\n        </Grid>\n      }\n      triggerIcon={<DatePicker2 />}\n      innerRef={innerRef}\n      ariaLabel=\"Open Single Date Filter\"\n    />\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAyE;AACzE,sBAA4B;AAE5B,qBAAqB;AACrB,gCAA2C;AAC3C,8BAA4C;AAE5C,uBAA4B;AAErB,MAAM,mBAAqD,CAAC,UAAU;AAC3E,QAAM;AAAA,IACJ;AAAA,IACA,QAAQ,EAAE;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,QAAM,CAAC,MAAM,WAAW,2BAAS,eAAe,EAAE;AAElD,8BAAU,MAAM;AACd,YAAQ,eAAe,EAAE;AAAA,EAC3B,GAAG,CAAC,WAAW,CAAC;AAEhB,8BAAU,MAAM;AACd,QAAI,CAAC,KAAK,SAAS,GAAG;AAAG,oBAAc,qCAAa,aAAa,QAAQ,MAAS;AAAA,EAGpF,GAAG,CAAC,IAAI,CAAC;AAET,QAAM,mBAAmB,8BAAY,MAAM;AACzC,mCAA+B,IAAI,IAAI;AAAA,EACzC,GAAG,CAAC,IAAI,8BAA8B,CAAC;AAEvC,QAAM,MAAM,yBAAO;AACnB,QAAM,cAAc,yBAAO,IAAI;AAC/B,QAAM,YAAY,8BAAY,CAAC,WAAW;AACxC,QAAI,IAAI;AAAS,UAAI,UAAU;AAC/B,QAAI,YAAY,SAAS;AACvB,iBAAW,MAAM;AACf,gBAAQ,MAAM;AACd,oBAAY,UAAU;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,8BAAU,MAAM;AACd,QAAI,aAAa,gBAAgB;AAC/B,kBAAY,UAAU;AAAA,IACxB;AAAA,EACF,GAAG,CAAC,aAAa,cAAc,CAAC;AAEhC,SACE,mDAAC;AAAA,IACC;AAAA,IACA;AAAA,IACA,UAAU,OAAO;AAAA,IACjB,aACE,mDAAC;AAAA,MAAK,eAAa,6BAAY;AAAA,MAAmC,OAAM;AAAA,OACtE,mDAAC;AAAA,MAAK,GAAE;AAAA,MAAM,OAAO,EAAE,YAAY,QAAQ;AAAA,OACzC,mDAAC;AAAA,MACC;AAAA,MACA,cAAc;AAAA,MACd,MAAK;AAAA,MACL,aAAW;AAAA,MACX,UAAU;AAAA,KACZ,CACF,GACA,mDAAC;AAAA,MAAK,WAAW,CAAC,MAAM,EAAE,SAAS,WAAW,WAAW,kBAAkB,CAAC;AAAA,OAC1E,mDAAC;AAAA,MAA2B;AAAA,MAAY,cAAc;AAAA,MAAS,MAAK;AAAA,KAA8B,CACpG,CACF;AAAA,IAEF,aAAa,mDAAC,iCAAY;AAAA,IAC1B;AAAA,IACA,WAAU;AAAA,GACZ;AAEJ;",
   "names": []
 }

package/dist/cjs/configs/useInternalStateConfig.js

@@ -40,7 +40,7 @@ const useInternalStateConfig = () => {
   const patchHeaderFilterButtonAndMenu = (0, import_react.useCallback)((headerId, value) => {
     const newState = { hideFilterMenu: value, hideFilterButton: value };
     patchHeader(headerId, newState);
-  }, []);
+  }, [patchHeader]);
   return (0, import_react.useMemo)(() => ({
     drilldownRowId,
     setDrilldownRowId,

package/dist/cjs/configs/useInternalStateConfig.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/configs/useInternalStateConfig.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import { useCallback, useMemo, useState } from 'react';\nimport { ReduxHeader } from '../types/props';\n\nexport const useInternalStateConfig = () => {\n  const [drilldownRowId, setDrilldownRowId] = useState<string | null>(null);\n  const [focusedRowId, setFocusedRowId] = useState<string | null>(null);\n\n  // TODO: @uluduena partition this state better\n  const [reduxHeaders, setReduxHeaders] = useState<Record<string, ReduxHeader>>({});\n\n  const patchHeader = useCallback((headerId: string, newHeader: Partial<ReduxHeader>) => {\n    setReduxHeaders((prevReduxHeaders) => {\n      const nextReduxHeaders = { ...prevReduxHeaders };\n      nextReduxHeaders[headerId] = { ...(nextReduxHeaders?.[headerId] ?? {}), ...newHeader };\n      return nextReduxHeaders;\n    });\n  }, []);\n\n  const patchHeaderFilterButtonAndMenu = useCallback((headerId: string, value: boolean) => {\n    const newState = { hideFilterMenu: value, hideFilterButton: value };\n    patchHeader(headerId, newState);\n  }, []);\n\n  return useMemo(\n    () => ({\n      drilldownRowId,\n      setDrilldownRowId,\n      focusedRowId,\n      setFocusedRowId,\n      reduxHeaders,\n      patchHeader,\n      patchHeaderFilterButtonAndMenu,\n    }),\n    [\n      drilldownRowId,\n      setDrilldownRowId,\n      focusedRowId,\n      setFocusedRowId,\n      reduxHeaders,\n      patchHeader,\n      patchHeaderFilterButtonAndMenu,\n    ],\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA+C;AAGxC,MAAM,yBAAyB,MAAM;AAC1C,QAAM,CAAC,gBAAgB,qBAAqB,2BAAwB,IAAI;AACxE,QAAM,CAAC,cAAc,mBAAmB,2BAAwB,IAAI;AAGpE,QAAM,CAAC,cAAc,mBAAmB,2BAAsC,CAAC,CAAC;AAEhF,QAAM,cAAc,8BAAY,CAAC,UAAkB,cAAoC;AACrF,oBAAgB,CAAC,qBAAqB;AACpC,YAAM,mBAAmB,EAAE,GAAG,iBAAiB;AAC/C,uBAAiB,YAAY,EAAE,GAAI,mBAAmB,aAAa,CAAC,GAAI,GAAG,UAAU;AACrF,aAAO;AAAA,IACT,CAAC;AAAA,EACH,GAAG,CAAC,CAAC;AAEL,QAAM,iCAAiC,8BAAY,CAAC,UAAkB,UAAmB;AACvF,UAAM,WAAW,EAAE,gBAAgB,OAAO,kBAAkB,MAAM;AAClE,gBAAY,UAAU,QAAQ;AAAA,EAChC,GAAG,CAAC,CAAC;AAEL,SAAO,0BACL,MAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACA;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CACF;AACF;",
+  "sourcesContent": ["import { useCallback, useMemo, useState } from 'react';\nimport { ReduxHeader } from '../types/props';\n\nexport const useInternalStateConfig = () => {\n  const [drilldownRowId, setDrilldownRowId] = useState<string | null>(null);\n  const [focusedRowId, setFocusedRowId] = useState<string | null>(null);\n\n  // TODO: @uluduena partition this state better\n  const [reduxHeaders, setReduxHeaders] = useState<Record<string, ReduxHeader>>({});\n\n  const patchHeader = useCallback((headerId: string, newHeader: Partial<ReduxHeader>) => {\n    setReduxHeaders((prevReduxHeaders) => {\n      const nextReduxHeaders = { ...prevReduxHeaders };\n      nextReduxHeaders[headerId] = { ...(nextReduxHeaders?.[headerId] ?? {}), ...newHeader };\n      return nextReduxHeaders;\n    });\n  }, []);\n\n  const patchHeaderFilterButtonAndMenu = useCallback(\n    (headerId: string, value: boolean) => {\n      const newState = { hideFilterMenu: value, hideFilterButton: value };\n      patchHeader(headerId, newState);\n    },\n    [patchHeader],\n  );\n\n  return useMemo(\n    () => ({\n      drilldownRowId,\n      setDrilldownRowId,\n      focusedRowId,\n      setFocusedRowId,\n      reduxHeaders,\n      patchHeader,\n      patchHeaderFilterButtonAndMenu,\n    }),\n    [\n      drilldownRowId,\n      setDrilldownRowId,\n      focusedRowId,\n      setFocusedRowId,\n      reduxHeaders,\n      patchHeader,\n      patchHeaderFilterButtonAndMenu,\n    ],\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA+C;AAGxC,MAAM,yBAAyB,MAAM;AAC1C,QAAM,CAAC,gBAAgB,qBAAqB,2BAAwB,IAAI;AACxE,QAAM,CAAC,cAAc,mBAAmB,2BAAwB,IAAI;AAGpE,QAAM,CAAC,cAAc,mBAAmB,2BAAsC,CAAC,CAAC;AAEhF,QAAM,cAAc,8BAAY,CAAC,UAAkB,cAAoC;AACrF,oBAAgB,CAAC,qBAAqB;AACpC,YAAM,mBAAmB,EAAE,GAAG,iBAAiB;AAC/C,uBAAiB,YAAY,EAAE,GAAI,mBAAmB,aAAa,CAAC,GAAI,GAAG,UAAU;AACrF,aAAO;AAAA,IACT,CAAC;AAAA,EACH,GAAG,CAAC,CAAC;AAEL,QAAM,iCAAiC,8BACrC,CAAC,UAAkB,UAAmB;AACpC,UAAM,WAAW,EAAE,gBAAgB,OAAO,kBAAkB,MAAM;AAClE,gBAAY,UAAU,QAAQ;AAAA,EAChC,GACA,CAAC,WAAW,CACd;AAEA,SAAO,0BACL,MAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACA;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CACF;AACF;",
   "names": []
 }

package/dist/cjs/exported-related/FilterBar/FilterBarDropdownMenu.js

@@ -35,11 +35,12 @@ const FilterBarDropdownMenu = (props) => {
     tableProps: { onFiltersChange }
   } = (0, import_react.useContext)(import_DataTableContext.DataTableContext);
   const [isOpened, setIsOpened] = (0, import_react.useState)(false);
-  const { options: extraOptions, ...restProps } = props;
+  const { options: extraOptions, innerRef, ...restProps } = props;
   const removeFilters = (0, import_react.useCallback)(() => {
     onFiltersChange([]);
     setIsOpened(false);
-  }, [onFiltersChange]);
+    innerRef?.current?.focus?.();
+  }, [innerRef, onFiltersChange]);
   const options = (0, import_react.useMemo)(() => [
     {
       dsId: "__internal__option__clear__filters",
@@ -61,10 +62,15 @@ const FilterBarDropdownMenu = (props) => {
     options,
     onClickOutside: () => {
       setIsOpened(false);
+    },
+    onKeyDown: (e) => {
+      if (e.code === "Escape")
+        innerRef?.current?.focus?.();
     }
   }, /* @__PURE__ */ import_react.default.createElement(import_ds_button.DSButtonV2, {
     buttonType: import_ds_button.BUTTON_TYPES.ICON,
     onClick: () => setIsOpened((prevOpened) => !prevOpened),
+    innerRef,
     ...restProps
   }, /* @__PURE__ */ import_react.default.createElement(import_ds_icons.MoreOptionsVert, null))));
 };

package/dist/cjs/exported-related/FilterBar/FilterBarDropdownMenu.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/exported-related/FilterBar/FilterBarDropdownMenu.tsx", "../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useState, useContext, useRef, useCallback, useMemo } from 'react';\nimport { DSDropdownMenuV2 } from '@elliemae/ds-dropdownmenu';\nimport { DSButtonV2, BUTTON_TYPES } from '@elliemae/ds-button';\nimport { MoreOptionsVert } from '@elliemae/ds-icons';\nimport { DataTableContext } from '../../DataTableContext';\n\nexport const FilterBarDropdownMenu = (props) => {\n  const {\n    tableProps: { onFiltersChange },\n  } = useContext(DataTableContext);\n  const [isOpened, setIsOpened] = useState(false);\n\n  const { options: extraOptions, ...restProps } = props;\n  const removeFilters = useCallback(() => {\n    onFiltersChange([]);\n    setIsOpened(false);\n  }, [onFiltersChange]);\n\n  const options = useMemo(\n    () => [\n      {\n        dsId: '__internal__option__clear__filters',\n        label: 'Clear Filters',\n        type: 'single',\n        onClick: removeFilters,\n        onKeyDown: (e: React.KeyboardEvent) => {\n          if (['Enter', 'Space'].includes(e.code)) removeFilters();\n        },\n      },\n      ...extraOptions,\n    ],\n    [extraOptions, removeFilters],\n  );\n\n  return (\n    <div style={{ marginLeft: 'auto' }}>\n      <DSDropdownMenuV2\n        isOpened={isOpened}\n        startPlacementPreference=\"bottom-end\"\n        options={options}\n        onClickOutside={() => {\n          setIsOpened(false);\n        }}\n      >\n        <DSButtonV2\n          buttonType={BUTTON_TYPES.ICON}\n          onClick={() => setIsOpened((prevOpened) => !prevOpened)}\n          {...restProps}\n        >\n          <MoreOptionsVert />\n        </DSButtonV2>\n      </DSDropdownMenuV2>\n    </div>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA0E;AAC1E,6BAAiC;AACjC,uBAAyC;AACzC,sBAAgC;AAChC,8BAAiC;AAE1B,MAAM,wBAAwB,CAAC,UAAU;AAC9C,QAAM;AAAA,IACJ,YAAY,EAAE;AAAA,MACZ,6BAAW,wCAAgB;AAC/B,QAAM,CAAC,UAAU,eAAe,2BAAS,KAAK;AAE9C,QAAM,EAAE,SAAS,iBAAiB,cAAc;AAChD,QAAM,gBAAgB,8BAAY,MAAM;AACtC,oBAAgB,CAAC,CAAC;AAClB,gBAAY,KAAK;AAAA,EACnB,GAAG,CAAC,eAAe,CAAC;AAEpB,QAAM,UAAU,0BACd,MAAM;AAAA,IACJ;AAAA,MACE,MAAM;AAAA,MACN,OAAO;AAAA,MACP,MAAM;AAAA,MACN,SAAS;AAAA,MACT,WAAW,CAAC,MAA2B;AACrC,YAAI,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,IAAI;AAAG,wBAAc;AAAA,MACzD;AAAA,IACF;AAAA,IACA,GAAG;AAAA,EACL,GACA,CAAC,cAAc,aAAa,CAC9B;AAEA,SACE,mDAAC;AAAA,IAAI,OAAO,EAAE,YAAY,OAAO;AAAA,KAC/B,mDAAC;AAAA,IACC;AAAA,IACA,0BAAyB;AAAA,IACzB;AAAA,IACA,gBAAgB,MAAM;AACpB,kBAAY,KAAK;AAAA,IACnB;AAAA,KAEA,mDAAC;AAAA,IACC,YAAY,8BAAa;AAAA,IACzB,SAAS,MAAM,YAAY,CAAC,eAAe,CAAC,UAAU;AAAA,IACrD,GAAG;AAAA,KAEJ,mDAAC,qCAAgB,CACnB,CACF,CACF;AAEJ;",
+  "sourcesContent": ["import React, { useState, useContext, useRef, useCallback, useMemo } from 'react';\nimport { DSDropdownMenuV2 } from '@elliemae/ds-dropdownmenu';\nimport { DSButtonV2, BUTTON_TYPES } from '@elliemae/ds-button';\nimport { MoreOptionsVert } from '@elliemae/ds-icons';\nimport { DataTableContext } from '../../DataTableContext';\n\nexport const FilterBarDropdownMenu = (props) => {\n  const {\n    tableProps: { onFiltersChange },\n  } = useContext(DataTableContext);\n  const [isOpened, setIsOpened] = useState(false);\n\n  const { options: extraOptions, innerRef, ...restProps } = props;\n  const removeFilters = useCallback(() => {\n    onFiltersChange([]);\n    setIsOpened(false);\n    innerRef?.current?.focus?.();\n  }, [innerRef, onFiltersChange]);\n\n  const options = useMemo(\n    () => [\n      {\n        dsId: '__internal__option__clear__filters',\n        label: 'Clear Filters',\n        type: 'single',\n        onClick: removeFilters,\n        onKeyDown: (e: React.KeyboardEvent) => {\n          if (['Enter', 'Space'].includes(e.code)) removeFilters();\n        },\n      },\n      ...extraOptions,\n    ],\n    [extraOptions, removeFilters],\n  );\n\n  return (\n    <div style={{ marginLeft: 'auto' }}>\n      <DSDropdownMenuV2\n        isOpened={isOpened}\n        startPlacementPreference=\"bottom-end\"\n        options={options}\n        onClickOutside={() => {\n          setIsOpened(false);\n        }}\n        onKeyDown={(e: React.KeyboardEvent) => {\n          if (e.code === 'Escape') innerRef?.current?.focus?.();\n        }}\n      >\n        <DSButtonV2\n          buttonType={BUTTON_TYPES.ICON}\n          onClick={() => setIsOpened((prevOpened) => !prevOpened)}\n          innerRef={innerRef}\n          {...restProps}\n        >\n          <MoreOptionsVert />\n        </DSButtonV2>\n      </DSDropdownMenuV2>\n    </div>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA0E;AAC1E,6BAAiC;AACjC,uBAAyC;AACzC,sBAAgC;AAChC,8BAAiC;AAE1B,MAAM,wBAAwB,CAAC,UAAU;AAC9C,QAAM;AAAA,IACJ,YAAY,EAAE;AAAA,MACZ,6BAAW,wCAAgB;AAC/B,QAAM,CAAC,UAAU,eAAe,2BAAS,KAAK;AAE9C,QAAM,EAAE,SAAS,cAAc,aAAa,cAAc;AAC1D,QAAM,gBAAgB,8BAAY,MAAM;AACtC,oBAAgB,CAAC,CAAC;AAClB,gBAAY,KAAK;AACjB,cAAU,SAAS,QAAQ;AAAA,EAC7B,GAAG,CAAC,UAAU,eAAe,CAAC;AAE9B,QAAM,UAAU,0BACd,MAAM;AAAA,IACJ;AAAA,MACE,MAAM;AAAA,MACN,OAAO;AAAA,MACP,MAAM;AAAA,MACN,SAAS;AAAA,MACT,WAAW,CAAC,MAA2B;AACrC,YAAI,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,IAAI;AAAG,wBAAc;AAAA,MACzD;AAAA,IACF;AAAA,IACA,GAAG;AAAA,EACL,GACA,CAAC,cAAc,aAAa,CAC9B;AAEA,SACE,mDAAC;AAAA,IAAI,OAAO,EAAE,YAAY,OAAO;AAAA,KAC/B,mDAAC;AAAA,IACC;AAAA,IACA,0BAAyB;AAAA,IACzB;AAAA,IACA,gBAAgB,MAAM;AACpB,kBAAY,KAAK;AAAA,IACnB;AAAA,IACA,WAAW,CAAC,MAA2B;AACrC,UAAI,EAAE,SAAS;AAAU,kBAAU,SAAS,QAAQ;AAAA,IACtD;AAAA,KAEA,mDAAC;AAAA,IACC,YAAY,8BAAa;AAAA,IACzB,SAAS,MAAM,YAAY,CAAC,eAAe,CAAC,UAAU;AAAA,IACtD;AAAA,IACC,GAAG;AAAA,KAEJ,mDAAC,qCAAgB,CACnB,CACF,CACF;AAEJ;",
   "names": []
 }

package/dist/cjs/exported-related/FilterPopover.js

@@ -83,11 +83,11 @@ const FilterPopover = ({
       window.removeEventListener("blur", closeMenu);
     };
   }, [columnId, patchHeaderFilterButtonAndMenu]);
-  const handleTriggerClick = (e) => {
+  const handleTriggerClick = (0, import_react.useCallback)((e) => {
     onTriggerClick(columnId, e);
     patchHeader(columnId, { hideFilterMenu: isMenuOpen, hideFilterButton: false });
     e.stopPropagation();
-  };
+  }, [columnId, isMenuOpen, onTriggerClick, patchHeader]);
   const [referenceElement, setReferenceElement] = (0, import_react.useState)(null);
   const buttonTrapCallback = (0, import_react.useCallback)(() => {
     patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });

package/dist/cjs/exported-related/FilterPopover.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/exported-related/FilterPopover.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { MutableRefObject, useCallback, useContext, useEffect, useState } from 'react';\nimport { DSButton } from '@elliemae/ds-button';\nimport { DSPopperJS } from '@elliemae/ds-popperjs';\nimport { styled } from '@elliemae/ds-system';\nimport DataTableContext from '../DataTableContext';\nimport { DATA_TESTID } from '../configs/constants';\nimport { ReduxHeader, TypescriptColumn } from '../types/props';\n\nconst FilterButton = styled.span<{ hide: boolean }>`\n  display: inline-grid;\n  ${(props) => (props.hide ? 'opacity: 0; display: none; width: 0;' : '')}\n`;\n\nconst Button = styled(DSButton)`\n  position: relative;\n  justify-self: flex-end;\n`;\n\nconst PopperContent = styled.div`\n  background-color: #fff;\n`;\ninterface FilterPopoverProps {\n  column: TypescriptColumn;\n  columnId: string;\n  triggerIcon: JSX.Element;\n  menuContent: JSX.Element;\n  onTriggerClick?: (id: string, e: UIEvent) => void;\n  onClickOutsideMenu?: (id: string, e: UIEvent) => void;\n  reduxHeader: ReduxHeader;\n  innerRef: MutableRefObject<HTMLDivElement>;\n  ariaLabel: string;\n  customStyles?: React.CSSProperties;\n}\n\nconst ButtonTrap = ({ cb }) => (\n  <span\n    aria-hidden=\"true\"\n    tabIndex={0}\n    onFocus={(e) => {\n      e.stopPropagation();\n      cb();\n    }}\n  />\n);\n\nexport const FilterPopover: React.ComponentType<FilterPopoverProps> = ({\n  column,\n  columnId,\n  triggerIcon,\n  menuContent,\n  onTriggerClick = () => null,\n  onClickOutsideMenu = () => null,\n  reduxHeader,\n  innerRef,\n  ariaLabel,\n  customStyles,\n}) => {\n  const { hideFilterButton, hideFilterMenu } = reduxHeader || {\n    hideFilterButton: true,\n    hideFilterMenu: true,\n  };\n  const { patchHeaderFilterButtonAndMenu, patchHeader } = useContext(DataTableContext);\n  const isIconVisible = !hideFilterButton || !hideFilterMenu;\n  const isMenuOpen = !hideFilterMenu;\n\n  const handleClickOutsideMenu = (e) => {\n    onClickOutsideMenu(columnId, e);\n    if (isMenuOpen) patchHeaderFilterButtonAndMenu(columnId, true);\n  };\n\n  useEffect(() => {\n    const closeMenu = () => {\n      patchHeaderFilterButtonAndMenu(columnId, true);\n    };\n    window.addEventListener('blur', closeMenu);\n\n    return () => {\n      window.removeEventListener('blur', closeMenu);\n    };\n  }, [columnId, patchHeaderFilterButtonAndMenu]);\n\n  const handleTriggerClick = (e) => {\n    onTriggerClick(columnId, e);\n    patchHeader(columnId, { hideFilterMenu: isMenuOpen, hideFilterButton: false });\n    e.stopPropagation();\n  };\n\n  const [referenceElement, setReferenceElement] = useState(null);\n\n  const buttonTrapCallback = useCallback(() => {\n    patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n    referenceElement?.focus();\n  }, [columnId, patchHeader, referenceElement]);\n  return (\n    <div\n      // This is here to prevent propagation, and not trigger the sort functionality\n      onClick={(e) => e.stopPropagation()}\n      onKeyDown={(e) => {\n        e.stopPropagation();\n        if (e.code === 'Escape') {\n          patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n          referenceElement.focus();\n        }\n        // Stop propagation for some reason is not enough to prevent scrolling of the datatable\n        // so we just prevent default behaviour in this case\n        if (['ArrowUp', 'ArrowDown'].includes(e.code)) {\n          e.preventDefault();\n        }\n      }}\n      style={{ display: 'flex' }}\n    >\n      <FilterButton hide={!isIconVisible} data-testid={DATA_TESTID.DATA_TABLE_FILTER_BUTTON}>\n        <Button\n          onClick={handleTriggerClick}\n          buttonType=\"text\"\n          aria-label={ariaLabel}\n          aria-hidden=\"true\"\n          size=\"s\"\n          leftIcon={triggerIcon}\n          // implement treeview mergerefs\n          innerRef={(_ref) => {\n            if (isIconVisible) setReferenceElement(_ref);\n            innerRef.current = _ref;\n          }}\n          tabIndex={reduxHeader?.withTabStops ? 0 : -1}\n        />\n      </FilterButton>\n      {referenceElement && (\n        <DSPopperJS\n          referenceElement={referenceElement}\n          showPopover={isMenuOpen}\n          closeContextMenu={handleClickOutsideMenu}\n          data-testid={DATA_TESTID.DATA_TABLE_FILTER_MENU_CONTENT}\n          startPlacementPreference=\"bottom-end\"\n          customOffset={[5, 4]}\n          withoutArrow\n          withoutAnimation\n          extraPopperStyles={{\n            ...customStyles,\n            minWidth: column.ref?.current?.offsetWidth ?? '0px',\n          }}\n          placementOrderPreference={['bottom-end']}\n        >\n          <PopperContent>\n            <ButtonTrap cb={buttonTrapCallback} />\n            {menuContent}\n            <ButtonTrap cb={buttonTrapCallback} />\n          </PopperContent>\n        </DSPopperJS>\n      )}\n    </div>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { MutableRefObject, useCallback, useContext, useEffect, useState } from 'react';\nimport { DSButton } from '@elliemae/ds-button';\nimport { DSPopperJS } from '@elliemae/ds-popperjs';\nimport { styled } from '@elliemae/ds-system';\nimport DataTableContext from '../DataTableContext';\nimport { DATA_TESTID } from '../configs/constants';\nimport { ReduxHeader, TypescriptColumn } from '../types/props';\n\nconst FilterButton = styled.span<{ hide: boolean }>`\n  display: inline-grid;\n  ${(props) => (props.hide ? 'opacity: 0; display: none; width: 0;' : '')}\n`;\n\nconst Button = styled(DSButton)`\n  position: relative;\n  justify-self: flex-end;\n`;\n\nconst PopperContent = styled.div`\n  background-color: #fff;\n`;\ninterface FilterPopoverProps {\n  column: TypescriptColumn;\n  columnId: string;\n  triggerIcon: JSX.Element;\n  menuContent: JSX.Element;\n  onTriggerClick?: (id: string, e: UIEvent) => void;\n  onClickOutsideMenu?: (id: string, e: UIEvent) => void;\n  reduxHeader: ReduxHeader;\n  innerRef: MutableRefObject<HTMLDivElement>;\n  ariaLabel: string;\n  customStyles?: React.CSSProperties;\n}\n\nconst ButtonTrap = ({ cb }) => (\n  <span\n    aria-hidden=\"true\"\n    tabIndex={0}\n    onFocus={(e) => {\n      e.stopPropagation();\n      cb();\n    }}\n  />\n);\n\nexport const FilterPopover: React.ComponentType<FilterPopoverProps> = ({\n  column,\n  columnId,\n  triggerIcon,\n  menuContent,\n  onTriggerClick = () => null,\n  onClickOutsideMenu = () => null,\n  reduxHeader,\n  innerRef,\n  ariaLabel,\n  customStyles,\n}) => {\n  const { hideFilterButton, hideFilterMenu } = reduxHeader || {\n    hideFilterButton: true,\n    hideFilterMenu: true,\n  };\n  const { patchHeaderFilterButtonAndMenu, patchHeader } = useContext(DataTableContext);\n  const isIconVisible = !hideFilterButton || !hideFilterMenu;\n  const isMenuOpen = !hideFilterMenu;\n\n  const handleClickOutsideMenu = (e) => {\n    onClickOutsideMenu(columnId, e);\n    if (isMenuOpen) patchHeaderFilterButtonAndMenu(columnId, true);\n  };\n\n  useEffect(() => {\n    const closeMenu = () => {\n      patchHeaderFilterButtonAndMenu(columnId, true);\n    };\n    window.addEventListener('blur', closeMenu);\n\n    return () => {\n      window.removeEventListener('blur', closeMenu);\n    };\n  }, [columnId, patchHeaderFilterButtonAndMenu]);\n\n  const handleTriggerClick = useCallback(\n    (e) => {\n      onTriggerClick(columnId, e);\n      patchHeader(columnId, { hideFilterMenu: isMenuOpen, hideFilterButton: false });\n      e.stopPropagation();\n    },\n    [columnId, isMenuOpen, onTriggerClick, patchHeader],\n  );\n\n  const [referenceElement, setReferenceElement] = useState(null);\n\n  const buttonTrapCallback = useCallback(() => {\n    patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n    referenceElement?.focus();\n  }, [columnId, patchHeader, referenceElement]);\n  return (\n    <div\n      // This is here to prevent propagation, and not trigger the sort functionality\n      onClick={(e) => e.stopPropagation()}\n      onKeyDown={(e) => {\n        e.stopPropagation();\n        if (e.code === 'Escape') {\n          patchHeader(columnId, { hideFilterMenu: true, hideFilterButton: false });\n          referenceElement.focus();\n        }\n        // Stop propagation for some reason is not enough to prevent scrolling of the datatable\n        // so we just prevent default behaviour in this case\n        if (['ArrowUp', 'ArrowDown'].includes(e.code)) {\n          e.preventDefault();\n        }\n      }}\n      style={{ display: 'flex' }}\n    >\n      <FilterButton hide={!isIconVisible} data-testid={DATA_TESTID.DATA_TABLE_FILTER_BUTTON}>\n        <Button\n          onClick={handleTriggerClick}\n          buttonType=\"text\"\n          aria-label={ariaLabel}\n          aria-hidden=\"true\"\n          size=\"s\"\n          leftIcon={triggerIcon}\n          // implement treeview mergerefs\n          innerRef={(_ref) => {\n            if (isIconVisible) setReferenceElement(_ref);\n            innerRef.current = _ref;\n          }}\n          tabIndex={reduxHeader?.withTabStops ? 0 : -1}\n        />\n      </FilterButton>\n      {referenceElement && (\n        <DSPopperJS\n          referenceElement={referenceElement}\n          showPopover={isMenuOpen}\n          closeContextMenu={handleClickOutsideMenu}\n          data-testid={DATA_TESTID.DATA_TABLE_FILTER_MENU_CONTENT}\n          startPlacementPreference=\"bottom-end\"\n          customOffset={[5, 4]}\n          withoutArrow\n          withoutAnimation\n          extraPopperStyles={{\n            ...customStyles,\n            minWidth: column.ref?.current?.offsetWidth ?? '0px',\n          }}\n          placementOrderPreference={['bottom-end']}\n        >\n          <PopperContent>\n            <ButtonTrap cb={buttonTrapCallback} />\n            {menuContent}\n            <ButtonTrap cb={buttonTrapCallback} />\n          </PopperContent>\n        </DSPopperJS>\n      )}\n    </div>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/parts/Headers/HeaderResizer.js

@@ -67,10 +67,10 @@ const HeaderResizer = ({ column }) => {
     e.stopPropagation();
   }, [column.id, nextWidth, visibleColumnsCopy]);
   const onResizeEnd = (0, import_react.useCallback)(() => {
-    setGridLayout((0, import_helpers.columnsToGrid)(visibleColumnsCopy, import_constants.ColsLayoutStyle.Fixed));
+    setGridLayout((0, import_helpers.columnsToGrid)(visibleColumns, import_constants.ColsLayoutStyle.Fixed));
     setIsResizing(false);
     onColumnResize(column.id, nextWidth);
-  }, [onColumnResize, column.id, nextWidth, setGridLayout, visibleColumnsCopy]);
+  }, [onColumnResize, column.id, nextWidth, setGridLayout, visibleColumns]);
   (0, import_react.useEffect)(() => {
     const debouncedResizeHandler = onResizeHandler;
     const debouncedResizeEnd = onResizeEnd;