@bigbinary/neeto-filters-frontend 2.12.7 → 2.12.9

package/dist/index.js

@@ -6973,12 +6973,9 @@ var Datetime = function Datetime(_ref) {
     filter = _ref.filter,
     handleApplyFilter = _ref.handleApplyFilter,
     autoFocus = _ref.autoFocus;
-  var _useState = useState(initializeDateRule(filter)),
-    _useState2 = _slicedToArray(_useState, 2),
-    selectedRule = _useState2[0],
-    setSelectedRule = _useState2[1];
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var selectedRule = filter ? initializeDateRule(filter) : {};
   var key = column.key,
     _column$defaultType = column.defaultType,
     defaultType = _column$defaultType === void 0 ? column.type : _column$defaultType,
@@ -6990,10 +6987,8 @@ var Datetime = function Datetime(_ref) {
       handleApplyFilter({
         _delete: true
       });
-      setSelectedRule({});
       return;
     }
-    setSelectedRule(option);
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
@@ -7006,7 +7001,6 @@ var Datetime = function Datetime(_ref) {
       handleApplyFilter({
         _delete: true
       });
-      setSelectedRule({});
       return;
     }
     var updatedFilter = buildUpdatedFilter({
@@ -7265,7 +7259,8 @@ var Text = function Text(_ref) {
     filter = _ref.filter,
     filters = _ref.filters,
     handleApplyFilter = _ref.handleApplyFilter,
-    autoFocus = _ref.autoFocus;
+    autoFocus = _ref.autoFocus,
+    onClose = _ref.onClose;
   var key = column.key,
     _column$defaultType = column.defaultType,
     defaultType = _column$defaultType === void 0 ? column.type : _column$defaultType,
@@ -7292,14 +7287,35 @@ var Text = function Text(_ref) {
   var debouncedInputValue = useDebounce(inputValue);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var handleUpdateAndApplyFilter = function handleUpdateAndApplyFilter() {
+    var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : debouncedInputValue;
+    var rule = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : selectedRule;
+    if (equals(filter === null || filter === void 0 ? void 0 : filter.value, value) && equals(selectedRule, rule)) return;
+    var updatedFilter = buildUpdatedFilter({
+      column: column,
+      defaultType: defaultType,
+      option: {},
+      rule: rule.value,
+      value: value.trim()
+    });
+    handleApplyFilter(updatedFilter);
+  };
+  var handleKeydown = function handleKeydown(e) {
+    if (e.key === "Enter") {
+      handleUpdateAndApplyFilter(inputValue);
+      onClose();
+    }
+  };
+  var handleRuleChange = function handleRuleChange(ruleOption) {
+    setSelectedRule(ruleOption);
+    if (!debouncedInputValue) return;
+    handleUpdateAndApplyFilter(debouncedInputValue, ruleOption);
+  };
 
   // Reset states when "Clear filters" button is clicked.
   useEffect(function () {
-    if (isEmpty(filters)) {
-      setInputValue("");
-      setSelectedRule(ruleOptions[0]);
-    }
-  }, [filters]);
+    (isEmpty(filters) || isNil(filter)) && setInputValue("");
+  }, [filters, filter]);
   useEffect(function () {
     if (!debouncedInputValue) {
       !isUndefinedOrEmpty(filter) && handleApplyFilter({
@@ -7307,27 +7323,8 @@ var Text = function Text(_ref) {
       });
       return;
     }
-    var updatedFilter = buildUpdatedFilter({
-      column: column,
-      defaultType: defaultType,
-      option: {},
-      rule: selectedRule.value,
-      value: debouncedInputValue.trim()
-    });
-    handleApplyFilter(updatedFilter);
+    handleUpdateAndApplyFilter();
   }, [debouncedInputValue]);
-  var handleRuleChange = function handleRuleChange(ruleOption) {
-    setSelectedRule(ruleOption);
-    if (!debouncedInputValue) return;
-    var updatedFilter = buildUpdatedFilter({
-      column: column,
-      defaultType: defaultType,
-      option: {},
-      rule: ruleOption.value,
-      value: debouncedInputValue.trim()
-    });
-    handleApplyFilter(updatedFilter);
-  };
   return /*#__PURE__*/React.createElement("div", {
     className: "neeto-filters-pane-filter__item-wrapper"
   }, showRuleSelector && /*#__PURE__*/React.createElement(Select, {
@@ -7349,7 +7346,8 @@ var Text = function Text(_ref) {
     }),
     onChange: function onChange(event) {
       return setInputValue(event.target.value);
-    }
+    },
+    onKeyDown: handleKeydown
   }, otherProps)));
 };
 
@@ -7422,7 +7420,8 @@ var Item = function Item(_ref) {
   var column = _ref.column,
     filters = _ref.filters,
     onChange = _ref.onChange,
-    autoFocus = _ref.autoFocus;
+    autoFocus = _ref.autoFocus,
+    onClose = _ref.onClose;
   var key = column.key,
     _column$defaultType = column.defaultType,
     defaultType = _column$defaultType === void 0 ? column.type : _column$defaultType;
@@ -7444,7 +7443,8 @@ var Item = function Item(_ref) {
       column: column,
       filter: filter,
       filters: filters,
-      handleApplyFilter: handleApplyFilter
+      handleApplyFilter: handleApplyFilter,
+      onClose: onClose
     });
   }
   if (isDate(defaultType)) {
@@ -7606,7 +7606,8 @@ var Pane = function Pane(_ref) {
       column: column,
       filters: filters,
       key: column.key,
-      onChange: handleChange
+      onChange: handleChange,
+      onClose: onClose
     });
   }), isPresent(groupedColumns) && /*#__PURE__*/React.createElement(Accordion, {
     defaultActiveKey: groupedColumns.findIndex(function (_ref4) {