@elliemae/ds-data-table 2.0.0-alpha.11 → 2.0.0-alpha.12

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

@@ -0,0 +1,169 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+var _jsx = require('@babel/runtime/helpers/jsx');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('react');
+var Grid = require('@elliemae/ds-grid');
+var dsForm = require('@elliemae/ds-form');
+var dsFormLayoutBlocks = require('@elliemae/ds-form-layout-blocks');
+var dsIcons = require('@elliemae/ds-icons');
+var FilterPopover = require('../../../../exported-related/FilterPopover.js');
+require('core-js/modules/web.dom-collections.iterator.js');
+require('../../../../styled.js');
+require('../../../../DataTableContext.js');
+require('react/jsx-runtime');
+require('styled-components');
+require('@elliemae/ds-button');
+require('@elliemae/ds-utilities');
+var constants = require('../../../../configs/constants.js');
+require('core-js/modules/esnext.async-iterator.reduce.js');
+require('core-js/modules/esnext.iterator.reduce.js');
+require('react-virtual');
+require('../../../../configs/useRowFlattenization.js');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('../../../../parts/TableContent.js');
+require('@elliemae/ds-circular-progress-indicator');
+require('@elliemae/ds-system');
+require('../../../../parts/Row.js');
+require('../../../../parts/Footer.js');
+require('../../../../parts/HoC/SortableItemContext.js');
+require('uid');
+var FilterTypes = require('../../../../exported-related/FilterTypes.js');
+require('../../../../exported-related/Filters/applyOutOfTheBoxFilters.js');
+require('moment');
+require('core-js/modules/esnext.async-iterator.some.js');
+require('core-js/modules/esnext.iterator.some.js');
+require('../../../../redux/reducers/headersReducers/headersReducers.js');
+var useDispatchHeadersActions = require('../../../../redux/reducers/headersReducers/useDispatchHeadersActions.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
+
+var _SearchXsmall;
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+const opts = {
+  prefix: '',
+  suffix: '',
+  allowDecimal: true,
+  decimalLimit: 2,
+  includeThousandsSeparator: false,
+  requireDecimal: true,
+  allowNegative: true
+};
+const CurrencyRangeFilter = props => {
+  var _filterValue$from, _filterValue$to, _column$ref$current$o, _column$ref, _column$ref$current;
+
+  const {
+    column,
+    filterValue = {
+      from: null,
+      to: null
+    },
+    reduxHeader,
+    onValueChange,
+    innerRef
+  } = props;
+
+  const handleFromChange = e => {
+    const nextValue = _objectSpread(_objectSpread({}, filterValue), {}, {
+      from: e.target.value
+    });
+
+    onValueChange(FilterTypes.FILTER_TYPES.CURRENCY_RANGE, nextValue);
+  };
+
+  const handleToChange = e => {
+    const nextValue = _objectSpread(_objectSpread({}, filterValue), {}, {
+      to: e.target.value
+    });
+
+    onValueChange(FilterTypes.FILTER_TYPES.CURRENCY_RANGE, nextValue);
+  };
+
+  const {
+    patchHeader
+  } = useDispatchHeadersActions.useDispatchHeadersActions(); // workaround to close menu with esc key since DSInputMask has stoppropagation on key down
+
+  const closePopover = e => {
+    if (e.code === 'Escape') {
+      patchHeader(column.id, {
+        hideFilterMenu: true,
+        hideFilterButton: false
+      });
+      innerRef.current.focus();
+    }
+  };
+
+  const idPreffix = 'datatable-currency-range';
+  return /*#__PURE__*/_jsx__default["default"](FilterPopover.FilterPopover, {
+    reduxHeader: reduxHeader,
+    column: column,
+    columnId: column.id,
+    menuContent: /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
+      "data-testid": constants.DATA_TESTID.DATA_TABLE_CURRENCY_RANGE_CONTROLLER,
+      gutter: "xxxs",
+      padding: "xxs",
+      cols: ['auto', 'auto'],
+      style: {
+        background: 'white'
+      }
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsFormLayoutBlocks.DSFormLayoutBlockItem, {
+      label: "Min",
+      inputID: "".concat(idPreffix, "-min-").concat(column.id)
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsForm.DSInputMask, {
+      containerProps: {
+        style: {
+          textAlign: 'right'
+        }
+      },
+      id: "".concat(idPreffix, "-min-").concat(column.id),
+      value: "".concat((_filterValue$from = filterValue === null || filterValue === void 0 ? void 0 : filterValue.from) !== null && _filterValue$from !== void 0 ? _filterValue$from : ''),
+      onChange: handleFromChange,
+      placeholder: "0.00",
+      mask: number => dsForm.MASK_TYPES.NUMBER(opts)(number),
+      autoFocus: true,
+      onKeyDown: e => {
+        closePopover(e);
+      }
+    })), /*#__PURE__*/_jsx__default["default"](dsFormLayoutBlocks.DSFormLayoutBlockItem, {
+      label: "Max",
+      inputID: "".concat(idPreffix, "-max-").concat(column.id)
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsForm.DSInputMask, {
+      containerProps: {
+        style: {
+          textAlign: 'right'
+        }
+      },
+      id: "".concat(idPreffix, "-max-").concat(column.id),
+      value: "".concat((_filterValue$to = filterValue === null || filterValue === void 0 ? void 0 : filterValue.to) !== null && _filterValue$to !== void 0 ? _filterValue$to : ''),
+      onChange: handleToChange,
+      placeholder: "0.00",
+      mask: number => dsForm.MASK_TYPES.NUMBER(opts)(number),
+      onKeyDown: e => {
+        closePopover(e);
+      }
+    }))),
+    triggerIcon: _SearchXsmall || (_SearchXsmall = /*#__PURE__*/_jsx__default["default"](dsIcons.SearchXsmall, {})),
+    customStyles: {
+      width: (_column$ref$current$o = (_column$ref = column.ref) === null || _column$ref === void 0 ? void 0 : (_column$ref$current = _column$ref.current) === null || _column$ref$current === void 0 ? void 0 : _column$ref$current.offsetWidth) !== null && _column$ref$current$o !== void 0 ? _column$ref$current$o : '0px'
+    },
+    innerRef: innerRef,
+    ariaLabel: "Open Currency Range Filter"
+  });
+};
+
+exports.CurrencyRangeFilter = CurrencyRangeFilter;

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('core-js/modules/web.dom-collections.iterator.js');
 var React = require('react');
-var DatePickerIcon = require('@elliemae/ds-icons/DatePicker2');
+var dsIcons = require('@elliemae/ds-icons');
 var Grid = require('@elliemae/ds-grid');
 var dsControlledForm = require('@elliemae/ds-controlled-form');
 var FilterPopover = require('../../../../exported-related/FilterPopover.js');
@@ -14,35 +14,40 @@ require('../../../../DataTableContext.js');
 require('react/jsx-runtime');
 require('styled-components');
 require('@elliemae/ds-button');
-require('@elliemae/ds-icons/MoreOptionsVert');
-require('@elliemae/ds-utilities/hooks');
+require('@elliemae/ds-utilities');
 var constants = require('../../../../configs/constants.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.reduce.js');
+require('core-js/modules/esnext.iterator.reduce.js');
 require('react-virtual');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 require('../../../../configs/useRowFlattenization.js');
 require('@babel/runtime/helpers/defineProperty');
-require('@elliemae/ds-icons');
-require('@elliemae/ds-form/Checkbox');
-require('@elliemae/ds-form/Radio');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('@elliemae/ds-form');
 require('../../../../parts/TableContent.js');
 require('@elliemae/ds-circular-progress-indicator');
-require('@elliemae/ds-icons/WarningTriangle');
 require('@elliemae/ds-system');
 require('../../../../parts/Row.js');
 require('../../../../parts/Footer.js');
-require('@elliemae/ds-icons/GripperVertical');
 require('../../../../parts/HoC/SortableItemContext.js');
 require('uid');
 var FilterTypes = require('../../../../exported-related/FilterTypes.js');
 require('../../../../exported-related/Filters/applyOutOfTheBoxFilters.js');
 require('moment');
+require('core-js/modules/esnext.async-iterator.some.js');
+require('core-js/modules/esnext.iterator.some.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var DatePickerIcon__default = /*#__PURE__*/_interopDefaultLegacy(DatePickerIcon);
 var Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
 
-var _DatePickerIcon;
+var _DatePicker;
 const emptyFilterValue = {
   startDate: null,
   endDate: null
@@ -101,7 +106,7 @@ const DateRangeFilter = props => {
       onToDateChange: setEndDate,
       type: "date-range-picker-controller-only"
     }))),
-    triggerIcon: _DatePickerIcon || (_DatePickerIcon = /*#__PURE__*/_jsx__default["default"](DatePickerIcon__default["default"], {})),
+    triggerIcon: _DatePicker || (_DatePicker = /*#__PURE__*/_jsx__default["default"](dsIcons.DatePicker2, {})),
     innerRef: innerRef,
     ariaLabel: "Open Date Range Filter"
   });

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

@@ -0,0 +1,145 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _jsx = require('@babel/runtime/helpers/jsx');
+require('core-js/modules/web.dom-collections.iterator.js');
+var React = require('react');
+var dsIcons = require('@elliemae/ds-icons');
+var Grid = require('@elliemae/ds-grid');
+var dsControlledForm = require('@elliemae/ds-controlled-form');
+var FilterPopover = require('../../../../exported-related/FilterPopover.js');
+require('../../../../styled.js');
+require('../../../../DataTableContext.js');
+require('react/jsx-runtime');
+require('styled-components');
+require('@elliemae/ds-button');
+require('@elliemae/ds-utilities');
+var constants = require('../../../../configs/constants.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.reduce.js');
+require('core-js/modules/esnext.iterator.reduce.js');
+require('react-virtual');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+require('../../../../configs/useRowFlattenization.js');
+require('@babel/runtime/helpers/defineProperty');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('@elliemae/ds-form');
+require('../../../../parts/TableContent.js');
+require('@elliemae/ds-circular-progress-indicator');
+require('@elliemae/ds-system');
+require('../../../../parts/Row.js');
+require('../../../../parts/Footer.js');
+require('../../../../parts/HoC/SortableItemContext.js');
+require('uid');
+var FilterTypes = require('../../../../exported-related/FilterTypes.js');
+require('../../../../exported-related/Filters/applyOutOfTheBoxFilters.js');
+require('moment');
+require('core-js/modules/esnext.async-iterator.some.js');
+require('core-js/modules/esnext.iterator.some.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
+
+var _DatePicker;
+const emptyFilterValue = {
+  startDate: null,
+  endDate: null
+};
+const DateSwitcherFilter = props => {
+  const {
+    column,
+    column: {
+      id
+    },
+    filterValue = emptyFilterValue,
+    onValueChange,
+    patchHeaderFilterButtonAndMenu,
+    reduxHeader,
+    innerRef
+  } = props;
+  const dateRange = filterValue;
+  const [startDate, setStartDate] = React.useState(dateRange.startDate || '');
+  const [endDate, setEndDate] = React.useState(dateRange.endDate || '');
+  const [isDateRange, setIsDateRange] = React.useState(false);
+  React.useEffect(() => {
+    setStartDate(dateRange.startDate || '');
+    setEndDate(dateRange.endDate || '');
+  }, [dateRange]);
+  React.useEffect(() => {
+    if (startDate && endDate && !startDate.includes('_') && !endDate.includes('_')) {
+      onValueChange(FilterTypes.FILTER_TYPES.DATE_SWITCHER, {
+        startDate,
+        endDate,
+        isDateRange
+      });
+    } // We are missing onValueChange on purpose, this is an internal function and won't cause any problems
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [startDate, endDate, isDateRange]);
+  return /*#__PURE__*/_jsx__default["default"](FilterPopover.FilterPopover, {
+    reduxHeader: reduxHeader,
+    column: column,
+    columnId: id,
+    menuContent: /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
+      width: "260px",
+      "data-testid": constants.DATA_TESTID.DATA_TABLE_DATE_RANGE_CONTROLLER
+    }, void 0, /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
+      p: "xxs",
+      gutter: "xxs",
+      style: {
+        background: 'white'
+      }
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsControlledForm.DSControlledCheckbox, {
+      checked: isDateRange,
+      name: "Date range",
+      label: "Date Range",
+      id: "date-range-switcher-id-internal",
+      onChange: () => {
+        setIsDateRange(!isDateRange);
+        setStartDate('');
+        setEndDate('');
+      },
+      autoFocus: true
+    }), isDateRange ? /*#__PURE__*/_jsx__default["default"](dsControlledForm.DSControlledDateRangePicker, {
+      fromDate: startDate,
+      onFromDateChange: setStartDate,
+      toDate: endDate,
+      onToDateChange: setEndDate,
+      type: "date-range-inputs"
+    }) : /*#__PURE__*/_jsx__default["default"](dsControlledForm.DSControlledDateTimePicker, {
+      date: startDate,
+      onDateChange: _date => {
+        setStartDate(_date);
+        setEndDate(_date);
+      },
+      type: "date-inputs"
+    })), /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
+      onKeyDown: e => e.code === 'Enter' && setTimeout(() => patchHeaderFilterButtonAndMenu(id, !!(dateRange.startDate || dateRange.endDate)), 0)
+    }, void 0, isDateRange ? /*#__PURE__*/_jsx__default["default"](dsControlledForm.DSControlledDateRangePicker, {
+      fromDate: startDate,
+      onFromDateChange: setStartDate,
+      toDate: endDate,
+      onToDateChange: setEndDate,
+      type: "date-range-picker-controller-only"
+    }) : /*#__PURE__*/_jsx__default["default"](dsControlledForm.DSControlledDateTimePicker, {
+      date: startDate,
+      onDateChange: _date => {
+        setStartDate(_date);
+        setEndDate(_date);
+      },
+      type: "date-picker-controller-only"
+    }))),
+    triggerIcon: _DatePicker || (_DatePicker = /*#__PURE__*/_jsx__default["default"](dsIcons.DatePicker2, {})),
+    innerRef: innerRef,
+    ariaLabel: "Open Date Range Filter"
+  });
+};
+
+exports.DateSwitcherFilter = DateSwitcherFilter;

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

@@ -2,12 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var _jsx = require('@babel/runtime/helpers/jsx');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('react');
 var Grid = require('@elliemae/ds-grid');
-var DSTextBox = require('@elliemae/ds-form/TextBox');
-var SearchIcon = require('@elliemae/ds-icons/SearchXsmall');
+var dsForm = require('@elliemae/ds-form');
+var dsFormLayoutBlocks = require('@elliemae/ds-form-layout-blocks');
+var dsIcons = require('@elliemae/ds-icons');
 var FilterPopover = require('../../../../exported-related/FilterPopover.js');
 require('core-js/modules/web.dom-collections.iterator.js');
 require('../../../../styled.js');
@@ -15,42 +21,50 @@ require('../../../../DataTableContext.js');
 require('react/jsx-runtime');
 require('styled-components');
 require('@elliemae/ds-button');
-require('@elliemae/ds-icons/MoreOptionsVert');
-require('@elliemae/ds-utilities/hooks');
+require('@elliemae/ds-utilities');
 var constants = require('../../../../configs/constants.js');
+require('core-js/modules/esnext.async-iterator.reduce.js');
+require('core-js/modules/esnext.iterator.reduce.js');
 require('react-virtual');
 require('../../../../configs/useRowFlattenization.js');
-require('@elliemae/ds-icons');
-require('@elliemae/ds-form/Checkbox');
-require('@elliemae/ds-form/Radio');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
 require('../../../../parts/TableContent.js');
 require('@elliemae/ds-circular-progress-indicator');
-require('@elliemae/ds-icons/WarningTriangle');
 require('@elliemae/ds-system');
 require('../../../../parts/Row.js');
 require('../../../../parts/Footer.js');
-require('@elliemae/ds-icons/GripperVertical');
 require('../../../../parts/HoC/SortableItemContext.js');
 require('uid');
 var FilterTypes = require('../../../../exported-related/FilterTypes.js');
 require('../../../../exported-related/Filters/applyOutOfTheBoxFilters.js');
 require('moment');
+require('core-js/modules/esnext.async-iterator.some.js');
+require('core-js/modules/esnext.iterator.some.js');
+require('../../../../redux/reducers/headersReducers/headersReducers.js');
+var useDispatchHeadersActions = require('../../../../redux/reducers/headersReducers/useDispatchHeadersActions.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
-var DSTextBox__default = /*#__PURE__*/_interopDefaultLegacy(DSTextBox);
-var SearchIcon__default = /*#__PURE__*/_interopDefaultLegacy(SearchIcon);
 
-var _Grid, _SearchIcon;
+var _SearchXsmall;
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+const opts = {
+  prefix: '',
+  suffix: '',
+  allowDecimal: false,
+  includeThousandsSeparator: false,
+  requireDecimal: false,
+  allowNegative: true
+};
 const NumberRangeFilter = props => {
-  var _filterValue$from, _filterValue$to;
+  var _filterValue$from, _filterValue$to, _column$ref$current$o, _column$ref, _column$ref$current;
 
   const {
     column,
@@ -64,51 +78,92 @@ const NumberRangeFilter = props => {
   } = props;
 
   const handleFromChange = e => {
-    var _e$target;
-
-    const from = (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) !== '' ? parseInt(e.target.value, 10) : '';
+    const from = e.target.value !== '' ? parseInt(e.target.value, 10) : '';
 
     const nextValue = _objectSpread(_objectSpread({}, filterValue), {}, {
       from
     });
 
-    onValueChange(FilterTypes.FILTER_TYPES.NUMBER_RANGE, nextValue);
+    onValueChange(FilterTypes.FILTER_TYPES.CURRENCY_RANGE, nextValue);
   };
 
   const handleToChange = e => {
-    var _e$target2;
-
-    const to = (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value) !== '' ? parseInt(e.target.value, 10) : '';
+    const to = e.target.value !== '' ? parseInt(e.target.value, 10) : '';
 
     const nextValue = _objectSpread(_objectSpread({}, filterValue), {}, {
       to
     });
 
-    onValueChange(FilterTypes.FILTER_TYPES.NUMBER_RANGE, nextValue);
+    onValueChange(FilterTypes.FILTER_TYPES.CURRENCY_RANGE, nextValue);
   };
 
+  const {
+    patchHeader
+  } = useDispatchHeadersActions.useDispatchHeadersActions(); // workaround to close menu with esc key since DSInputMask has stoppropagation on key down
+
+  const closePopover = e => {
+    if (e.code === 'Escape') {
+      patchHeader(column.id, {
+        hideFilterMenu: true,
+        hideFilterButton: false
+      });
+      innerRef.current.focus();
+    }
+  };
+
+  const idPreffix = 'datatable-number-range';
   return /*#__PURE__*/_jsx__default["default"](FilterPopover.FilterPopover, {
     reduxHeader: reduxHeader,
     column: column,
     columnId: column.id,
     menuContent: /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
       "data-testid": constants.DATA_TESTID.DATA_TABLE_NUMBER_RANGE_CONTROLLER,
-      gutter: "xxs",
-      padding: "xs",
-      cols: ['50px', 'auto', '50px']
-    }, void 0, /*#__PURE__*/_jsx__default["default"](DSTextBox__default["default"], {
+      gutter: "xxxs",
+      padding: "xxs",
+      cols: ['auto', 'auto'],
+      style: {
+        background: 'white'
+      }
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsFormLayoutBlocks.DSFormLayoutBlockItem, {
+      label: "Low",
+      inputID: "".concat(idPreffix, "-low-").concat(column.id)
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsForm.DSInputMask, {
+      containerProps: {
+        style: {
+          textAlign: 'right'
+        }
+      },
+      id: "".concat(idPreffix, "-low-").concat(column.id),
       value: "".concat((_filterValue$from = filterValue === null || filterValue === void 0 ? void 0 : filterValue.from) !== null && _filterValue$from !== void 0 ? _filterValue$from : ''),
       onChange: handleFromChange,
-      type: "number"
-    }), _Grid || (_Grid = /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
-      justifyItems: "center",
-      alignItems: "center"
-    }, void 0, "\u2014")), /*#__PURE__*/_jsx__default["default"](DSTextBox__default["default"], {
+      placeholder: "0",
+      mask: number => dsForm.MASK_TYPES.NUMBER(opts)(number),
+      autoFocus: true,
+      onKeyDown: e => {
+        closePopover(e);
+      }
+    })), /*#__PURE__*/_jsx__default["default"](dsFormLayoutBlocks.DSFormLayoutBlockItem, {
+      label: "High",
+      inputID: "".concat(idPreffix, "-high-").concat(column.id)
+    }, void 0, /*#__PURE__*/_jsx__default["default"](dsForm.DSInputMask, {
+      containerProps: {
+        style: {
+          textAlign: 'right'
+        }
+      },
+      id: "".concat(idPreffix, "-high-").concat(column.id),
       value: "".concat((_filterValue$to = filterValue === null || filterValue === void 0 ? void 0 : filterValue.to) !== null && _filterValue$to !== void 0 ? _filterValue$to : ''),
       onChange: handleToChange,
-      type: "number"
-    })),
-    triggerIcon: _SearchIcon || (_SearchIcon = /*#__PURE__*/_jsx__default["default"](SearchIcon__default["default"], {})),
+      placeholder: "0",
+      mask: number => dsForm.MASK_TYPES.NUMBER(opts)(number),
+      onKeyDown: e => {
+        closePopover(e);
+      }
+    }))),
+    triggerIcon: _SearchXsmall || (_SearchXsmall = /*#__PURE__*/_jsx__default["default"](dsIcons.SearchXsmall, {})),
+    customStyles: {
+      width: (_column$ref$current$o = (_column$ref = column.ref) === null || _column$ref === void 0 ? void 0 : (_column$ref$current = _column$ref.current) === null || _column$ref$current === void 0 ? void 0 : _column$ref$current.offsetWidth) !== null && _column$ref$current$o !== void 0 ? _column$ref$current$o : '0px'
+    },
     innerRef: innerRef,
     ariaLabel: "Open Number Range Filter"
   });