@monolith-forensics/monolith-ui 1.3.37 → 1.3.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -140,7 +140,7 @@ export const MenuItemList = ({ menuItems, searchable, onSearch, manualSearch, se
|
|
|
140
140
|
return isObjectArray ? (s === null || s === void 0 ? void 0 : s.value) === (item === null || item === void 0 ? void 0 : item.value) : s === item;
|
|
141
141
|
}));
|
|
142
142
|
if (item.items) {
|
|
143
|
-
return (_jsx(DropDownMenu, { data: item.items, size: size, buttonProps: { style }, disabled: item.disabled, children: item.label }));
|
|
143
|
+
return (_jsx(DropDownMenu, { data: item.items, size: size, buttonProps: Object.assign({ style }, item), disabled: item.disabled, children: item.label }));
|
|
144
144
|
}
|
|
145
145
|
return (_jsx(MenuItem, { className: "MenuItem", itemData: item, TooltipContent: TooltipContent, "data-selected": isSelected, "data-disabled": item.disabled, disabled: item.disabled, leftSection: multiselect ? (_jsxs(_Fragment, { children: [_jsx(CheckBox, { value: isSelected, size: size, onChange: (newValue) => {
|
|
146
146
|
var _a;
|
|
@@ -249,11 +249,12 @@ const Rules = ({ rules = [], combinator, showCombinator, filterDefinitions, onDe
|
|
|
249
249
|
const prevValue = rule.value;
|
|
250
250
|
let newValue;
|
|
251
251
|
const isBetween = operator.value.toLowerCase().includes("between");
|
|
252
|
-
if (
|
|
253
|
-
newValue =
|
|
252
|
+
if (isBetween) {
|
|
253
|
+
newValue = [(prevValue === null || prevValue === void 0 ? void 0 : prevValue[0]) || "", (prevValue === null || prevValue === void 0 ? void 0 : prevValue[1]) || ""];
|
|
254
254
|
}
|
|
255
255
|
else {
|
|
256
|
-
newValue =
|
|
256
|
+
newValue =
|
|
257
|
+
(prevValue === null || prevValue === void 0 ? void 0 : prevValue.length) && prevValue.length > 0 ? prevValue : undefined; // keep existing value if it exists, return undefined if array is empty
|
|
257
258
|
}
|
|
258
259
|
onUpdate(Object.assign(Object.assign({}, rule), { operator, value: newValue }));
|
|
259
260
|
};
|