@aivenio/aquarium 2.5.2 → 2.5.3

package/dist/system.mjs

@@ -10256,6 +10256,15 @@ var isOptionGroup = (val) => {
 var hasOptionGroups = (val) => {
   return val.some(isOptionGroup);
 };
+var defaultGetValue = (opt) => {
+  if (typeof opt === "string") {
+    return opt;
+  }
+  if (typeof opt.value === "string") {
+    return opt.value;
+  }
+  return opt;
+};
 
 // src/molecules/Combobox/Combobox.tsx
 var import_smallCross2 = __toESM(require_smallCross());
@@ -10330,6 +10339,12 @@ var ComboboxBase = (_a) => {
       }
     }
   };
+  const findItemByValue = (val) => {
+    if (val === null) {
+      return null;
+    }
+    return val === void 0 ? void 0 : inputItems.find((opt) => defaultGetValue(opt) === defaultGetValue(val));
+  };
   const {
     isOpen,
     openMenu,
@@ -10345,8 +10360,8 @@ var ComboboxBase = (_a) => {
     selectItem
   } = useCombobox({
     id,
-    selectedItem: value,
-    defaultSelectedItem: defaultValue,
+    selectedItem: findItemByValue(value),
+    defaultSelectedItem: findItemByValue(defaultValue),
     isItemDisabled: (item, index) => isOptionDisabled(item, index),
     itemToString,
     items: inputItems,
@@ -10520,7 +10535,7 @@ import { useControlledState } from "@react-stately/utils";
 import castArray2 from "lodash/castArray";
 import compact from "lodash/compact";
 import groupBy2 from "lodash/groupBy";
-import isArray3 from "lodash/isArray";
+import isArray2 from "lodash/isArray";
 import isFunction3 from "lodash/isFunction";
 
 // src/molecules/List/List.tsx
@@ -10730,16 +10745,12 @@ import { useId as useId8 } from "@react-aria/utils";
 import { useSelect } from "downshift";
 import { without } from "lodash";
 import defaults from "lodash/defaults";
-import isArray from "lodash/isArray";
 import isNil from "lodash/isNil";
 import omit6 from "lodash/omit";
 var hasIconProperty = (val) => {
   var _a;
   return typeof val === "string" || ((_a = val == null ? void 0 : val.icon) == null ? void 0 : _a.body) !== void 0;
 };
-var hasOptionGroups2 = (val) => {
-  return !val.some((opt) => (opt == null ? void 0 : opt.label) === void 0 || !isArray(opt == null ? void 0 : opt.options));
-};
 var defaultRenderOption = (item, props, { selectedItem }, { getOptionKey, getValue, optionToString = getOptionLabelBuiltin }) => {
   var _a, _b;
   return /* @__PURE__ */ React58.createElement(Select.Item, __spreadValues({
@@ -10749,15 +10760,6 @@ var defaultRenderOption = (item, props, { selectedItem }, { getOptionKey, getVal
     icon: item.icon
   }), optionToString(item));
 };
-var defaultGetValue = (opt) => {
-  if (typeof opt === "string") {
-    return opt;
-  }
-  if (typeof opt.value === "string") {
-    return opt.value;
-  }
-  return "";
-};
 var _SelectBase = (props) => {
   var _b;
   const withDefaults = defaults({}, props, {
@@ -10817,7 +10819,7 @@ var _SelectBase = (props) => {
   const [hasFocus, setFocus] = useState8(false);
   const targetRef = useRef7(null);
   const menuRef = useRef7(null);
-  const items = hasOptionGroups2(options) ? options.flatMap((g) => g.options) : options;
+  const items = hasOptionGroups(options) ? options.flatMap((g) => g.options) : options;
   const findItemByValue = (val) => {
     if (val === null) {
       return null;
@@ -10898,7 +10900,7 @@ var _SelectBase = (props) => {
     style: { width: (_b = targetRef.current) == null ? void 0 : _b.offsetWidth }
   }, /* @__PURE__ */ React58.createElement(Select.Menu, __spreadValues({
     maxHeight
-  }, menuProps), options.length === 0 && /* @__PURE__ */ React58.createElement(Select.EmptyStateContainer, null, emptyState), options.length > 0 && !hasOptionGroups2(options) && options.map(renderItem), options.length > 0 && hasOptionGroups2(options) && options.map(renderGroup), actions.length > 0 && /* @__PURE__ */ React58.createElement(React58.Fragment, null, /* @__PURE__ */ React58.createElement(Select.Divider, {
+  }, menuProps), options.length === 0 && /* @__PURE__ */ React58.createElement(Select.EmptyStateContainer, null, emptyState), options.length > 0 && !hasOptionGroups(options) && options.map(renderItem), options.length > 0 && hasOptionGroups(options) && options.map(renderGroup), actions.length > 0 && /* @__PURE__ */ React58.createElement(React58.Fragment, null, /* @__PURE__ */ React58.createElement(Select.Divider, {
     onMouseOver: () => setHighlightedIndex(-1)
   }), actions.map((act, index) => /* @__PURE__ */ React58.createElement(Select.ActionItem, __spreadProps(__spreadValues({
     key: `${index}`
@@ -11624,9 +11626,9 @@ function useScrollStyles({
 }
 
 // src/utils/table/types.ts
-import isArray2 from "lodash/isArray";
+import isArray from "lodash/isArray";
 var areRowsGrouped = (rows) => {
-  return !isArray2(rows);
+  return !isArray(rows);
 };
 var toSortDirection = (direction) => direction === "ascending" ? "asc" : direction === "descending" ? "desc" : false;
 var cellProps = (column) => {
@@ -12619,7 +12621,7 @@ var DataList2 = (_a) => {
   const defaultSortedColumn = columns.find((c) => c.headerName === (defaultSort == null ? void 0 : defaultSort.headerName));
   const initialSortState = defaultSortedColumn ? { column: defaultSortedColumn, direction: (_a2 = defaultSort == null ? void 0 : defaultSort.direction) != null ? _a2 : "ascending" } : {};
   const [sort, updateSort] = useTableSort(__spreadProps(__spreadValues({}, initialSortState), { onSortChanged }));
-  const sortedRows = isArray3(rows) ? sortRowsBy(rows, sort) : [];
+  const sortedRows = isArray2(rows) ? sortRowsBy(rows, sort) : [];
   const groups = areRowsGrouped(rows) ? rows : group ? isFunction3(group) ? group(sortedRows) : groupBy2(sortedRows, group) : void 0;
   const isCollapsible = isFunction3(rowDetails);
   const templateColumns = compact([
@@ -12816,7 +12818,7 @@ var DataList2 = (_a) => {
   }, componentContent) : componentContent;
   return /* @__PURE__ */ React72.createElement(DataListContext.Provider, {
     value: {
-      rows: isArray3(rows) ? sortedRows : rows,
+      rows: isArray2(rows) ? sortedRows : rows,
       selectedRows: selected
     }
   }, wrappedContent);