@linzjs/step-ag-grid 7.1.0 → 7.1.1

package/dist/src/utils/textMatcher.d.ts

@@ -7,7 +7,7 @@
  * "*L" => *L
  * "A B" => A* and B*
  * "A B, C" => (A* and B*) or C*
- *
- * Returns ture if there's a text match.
+ * "!A" => all values must not match A
+ * Returns true if there's a text match.
  */
 export declare const textMatch: (text: string | undefined | null, filter: string) => boolean;

package/dist/step-ag-grid.esm.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useMemo, useLayoutEffect, useEffect, createContext, memo, forwardRef, useRef, useContext, useState, useCallback, useReducer, cloneElement, useImperativeHandle, Fragment } from 'react';
 import ReactDOM, { unstable_batchedUpdates, flushSync, createPortal } from 'react-dom';
-import { findIndex, debounce, negate, isEmpty, delay, sortBy, last, difference, castArray, remove, flatten, xorBy, pick, groupBy, toPairs, omit } from 'lodash-es';
+import { findIndex, debounce, negate, isEmpty, delay, sortBy, last, difference, castArray, remove, flatten, xorBy, partition, pick, groupBy, fromPairs, toPairs, omit } from 'lodash-es';
 import { jsx, jsxs, Fragment as Fragment$1 } from 'react/jsx-runtime';
 import { AgGridReact } from 'ag-grid-react';
 import { LuiMiniSpinner, LuiIcon, LuiCheckboxInput, LuiButton } from '@linzjs/lui';
@@ -3516,8 +3516,8 @@ function isMatch(inputs, patterns, options) {
  * "*L" => *L
  * "A B" => A* and B*
  * "A B, C" => (A* and B*) or C*
- *
- * Returns ture if there's a text match.
+ * "!A" => all values must not match A
+ * Returns true if there's a text match.
  */
 var textMatch = function (text, filter) {
     if (text == null)
@@ -3526,12 +3526,15 @@ var textMatch = function (text, filter) {
         .split(",")
         .map(function (sf) { return sf.trim(); })
         .filter(function (sf) { return sf; });
+    var _a = partition(superFilters, function (superFilters) { return superFilters.startsWith("!"); }), negativeFilters = _a[0], positiveFilters = _a[1];
     var values = text.replaceAll(",", " ").trim().split(/\s+/);
-    return (isEmpty(superFilters) || // Not filtered
-        superFilters.some(function (superFilter) {
+    return ((isEmpty(positiveFilters) || // Not filtered
+        positiveFilters.some(function (superFilter) {
             var subFilters = superFilter.split(/\s+/).map(function (s) { return s.replaceAll(/([!?])/g, "\\$1"); });
             return subFilters.every(function (subFilter) { return values.some(function (value) { return isMatch(value, subFilter); }); });
-        }));
+        })) &&
+        (isEmpty(negativeFilters) ||
+            negativeFilters.every(function (superFilter) { return values.every(function (value) { return isMatch(value, superFilter); }); })));
 };
 
 var GridFormMultiSelect = function (props) {
@@ -3593,8 +3596,32 @@ var GridFormMultiSelect = function (props) {
      * Groups options into their header groups
      */
     var headerGroups = useMemo(function () {
-        return options &&
-            groupBy(options.filter(function (o) { return textMatch(o.label, filter) && o.value; }), "filter");
+        if (!options)
+            return undefined;
+        var result = groupBy(options.filter(function (o) { return textMatch(o.label, filter) && o.value; }), "filter");
+        // remove leading/trailing/duplicate dividers
+        return fromPairs(toPairs(result).map(function (_a) {
+            var key = _a[0], arr = _a[1];
+            var lastWasDivider = true;
+            return [
+                key,
+                arr
+                    .map(function (row, index) {
+                    if (row.value === MenuSeparatorString) {
+                        if (lastWasDivider)
+                            return null;
+                        if (index === arr.length - 1)
+                            return null;
+                        lastWasDivider = true;
+                    }
+                    else {
+                        lastWasDivider = false;
+                    }
+                    return row;
+                })
+                    .filter(function (r) { return r; }),
+            ];
+        }));
     }, [filter, options]);
     var headers = useMemo(function () { var _a; return (_a = props.headers) !== null && _a !== void 0 ? _a : [{ header: "" }]; }, [props.headers]);
     var _e = useGridPopoverHook({
@@ -3602,7 +3629,7 @@ var GridFormMultiSelect = function (props) {
         invalid: invalid,
         save: save
     }), popoverWrapper = _e.popoverWrapper, triggerSave = _e.triggerSave;
-    return popoverWrapper(jsx(ComponentLoadingWrapper, __assign({ loading: !options, className: "GridFormMultiSelect-container" }, { children: options && (jsxs(Fragment$1, { children: [props.filtered && (jsx(FilterInput, __assign({}, { headerGroups: headerGroups, options: options, setOptions: setOptions, filter: filter, setFilter: setFilter }, { filterHelpText: props.filterHelpText, onSelectFilter: props.onSelectFilter, filterPlaceholder: props.filterPlaceholder }))), headerGroups && (jsx("div", __assign({ className: "GridFormMultiSelect-options" }, { children: headers.map(function (header) {
+    return popoverWrapper(jsx(ComponentLoadingWrapper, __assign({ loading: !options, className: "GridFormMultiSelect-container" }, { children: options && (jsxs(Fragment$1, { children: [props.filtered && (jsx(FilterInput, __assign({}, { headerGroups: headerGroups, options: options, setOptions: setOptions, filter: filter, setFilter: setFilter, triggerSave: triggerSave }, { filterHelpText: props.filterHelpText, onSelectFilter: props.onSelectFilter, filterPlaceholder: props.filterPlaceholder }))), headerGroups && (jsx("div", __assign({ className: "GridFormMultiSelect-options" }, { children: headers.map(function (header) {
                         var subOptions = headerGroups["".concat(header.filter)];
                         return (!isEmpty(subOptions) && (jsxs(Fragment$1, { children: [header.header && jsx(MenuHeader, { children: header.header }), subOptions.map(function (item, index) {
                                     return item.value === MenuSeparatorString ? (jsx(MenuDivider, {}, "div_".concat(index))) : (jsxs(Fragment, { children: [jsx(MenuRadioItem, { item: item, options: options, setOptions: setOptions }), item.checked && item.subComponent && (jsx(MenuSubComponent, __assign({}, { item: item, options: options, setOptions: setOptions, data: data, triggerSave: triggerSave }, { subComponentIsValid: subComponentIsValidRef.current })))] }, "val_".concat(item.value)));
@@ -3610,14 +3637,19 @@ var GridFormMultiSelect = function (props) {
                     }) })))] })) })));
 };
 var FilterInput = function (props) {
-    var options = props.options, setOptions = props.setOptions, onSelectFilter = props.onSelectFilter, filter = props.filter, setFilter = props.setFilter, headerGroups = props.headerGroups, filterPlaceholder = props.filterPlaceholder, filterHelpText = props.filterHelpText;
+    var options = props.options, setOptions = props.setOptions, onSelectFilter = props.onSelectFilter, filter = props.filter, setFilter = props.setFilter, headerGroups = props.headerGroups, filterPlaceholder = props.filterPlaceholder, filterHelpText = props.filterHelpText, triggerSave = props.triggerSave;
+    var enterHasBeenPressed = useRef(false);
+    var lastKeyWasEnter = useRef(false);
     var toggleSelectAllVisible = useCallback(function () {
         if (!options || !headerGroups)
             return;
         if (isEmpty(filter.trim())) {
             // Toggle off if any items are checked otherwise on
             var anyChecked_1 = options.some(function (o) { return o.checked; });
-            options.forEach(function (o) { return (o.checked = !anyChecked_1); });
+            options.forEach(function (o) {
+                if (o.label !== undefined)
+                    o.checked = !anyChecked_1;
+            });
         }
         else {
             // Toggle on if any filtered items are checked otherwise off
@@ -3626,7 +3658,7 @@ var FilterInput = function (props) {
             });
             Object.values(headerGroups).forEach(function (headerOptions) {
                 headerOptions.forEach(function (o) {
-                    if (o.checked !== undefined)
+                    if (o.label !== undefined)
                         o.checked = anyChecked_2;
                 });
             });
@@ -3636,28 +3668,52 @@ var FilterInput = function (props) {
     var addCustomFilterValue = useCallback(function () {
         if (!options || !onSelectFilter)
             return;
+        var filterTrimmed = filter.trim();
+        if (isEmpty(filterTrimmed)) {
+            triggerSave().then();
+            return;
+        }
         var preFilterOptions = JSON.stringify(options);
-        onSelectFilter(filter.trim(), options);
+        onSelectFilter(filterTrimmed, options);
         // Detect if options list changed and update
         if (preFilterOptions === JSON.stringify(options))
             return;
         setOptions(__spreadArray([], options, true));
         setFilter("");
-    }, [filter, onSelectFilter, options, setFilter, setOptions]);
+    }, [filter, onSelectFilter, options, setFilter, setOptions, triggerSave]);
+    var handleKeyDown = useCallback(function (e) {
+        if (e.key === "Enter") {
+            enterHasBeenPressed.current = true;
+        }
+    }, []);
     var handleKeyUp = useCallback(function (e) {
         if (e.key === "Enter") {
             e.stopPropagation();
             e.preventDefault();
             if (e.ctrlKey)
                 toggleSelectAllVisible();
-            else if (onSelectFilter)
-                addCustomFilterValue();
+            else if (enterHasBeenPressed.current) {
+                var filterTrimmed = filter.trim();
+                if (isEmpty(filterTrimmed)) {
+                    triggerSave().then();
+                    return;
+                }
+                onSelectFilter && addCustomFilterValue();
+            }
+            lastKeyWasEnter.current = true;
+        }
+        else if (e.key === "Control") {
+            lastKeyWasEnter.current && setFilter("");
+            lastKeyWasEnter.current = false;
+        }
+        else {
+            lastKeyWasEnter.current = false;
         }
-    }, [addCustomFilterValue, onSelectFilter, toggleSelectAllVisible]);
-    return (jsxs(Fragment$1, { children: [jsx(FocusableItem, __assign({ className: "filter-item" }, { children: function (_) { return (jsxs("div", __assign({ style: { width: "100%" }, className: "GridFormMultiSelect-filter" }, { children: [jsx("input", { className: "LuiTextInput-input", type: "text", placeholder: filterPlaceholder !== null && filterPlaceholder !== void 0 ? filterPlaceholder : "Placeholder", "data-testid": "filteredMenu-free-text-input", value: filter, "data-disableenterautosave": true, "data-allowtabtosave": true, onChange: function (e) { return setFilter(e.target.value); }, onKeyUp: handleKeyUp }), filterHelpText && (jsx(FormError, { error: null, helpText: typeof filterHelpText === "function" ? filterHelpText(filter.trim(), options) : filterHelpText }))] }))); } }), "filter"), jsx(MenuDivider, {}, "$$divider_filter"), headerGroups && !toPairs(headerGroups).some(function (_a) {
+    }, [addCustomFilterValue, filter, onSelectFilter, setFilter, toggleSelectAllVisible, triggerSave]);
+    return (jsxs(Fragment$1, { children: [jsx(FocusableItem, __assign({ className: "filter-item" }, { children: function (_) { return (jsxs("div", __assign({ style: { width: "100%" }, className: "GridFormMultiSelect-filter" }, { children: [jsx("input", { className: "LuiTextInput-input", type: "text", placeholder: filterPlaceholder !== null && filterPlaceholder !== void 0 ? filterPlaceholder : "Placeholder", "data-testid": "filteredMenu-free-text-input", value: filter, "data-disableenterautosave": true, "data-allowtabtosave": true, onChange: function (e) { return setFilter(e.target.value); }, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp }), filterHelpText && (jsx(FormError, { error: null, helpText: typeof filterHelpText === "function" ? filterHelpText(filter.trim(), options) : filterHelpText }))] }))); } }), "filter"), jsx(MenuDivider, {}, "$$divider_filter"), headerGroups && !toPairs(headerGroups).some(function (_a) {
                 _a[0]; var options = _a[1];
                 return !isEmpty(options);
-            }) && (jsx("div", __assign({ className: "szh-menu__item" }, { children: "[No items match the filter]" })))] }));
+            }) && (jsx("div", __assign({ className: "szh-menu__item GridPopoverEditDropDown-noOptions" }, { children: "No Options" })))] }));
 };
 var MenuRadioItem = function (props) {
     var _a, _b;
@@ -4026,8 +4082,8 @@ var GridPopoverEditBearingCorrection = function (colDef, props) {
 
 var GridPopoverEditDropDown = function (colDef, props) {
     return GridCell(colDef, __assign(__assign({ editor: GridFormDropDown }, props), { editorParams: __assign({ 
-            // Defaults to medium size container
-            className: "GridPopoverEditDropDown-containerMedium" }, props.editorParams) }));
+            // Defaults to large size container
+            className: "GridPopoverEditDropDown-containerLarge" }, props.editorParams) }));
 };
 
 var GridFormMessage = function (props) {