@aivenio/aquarium 4.1.1 → 4.1.2
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.
@@ -31,7 +31,7 @@ DropdownMenu.Trigger.displayName = 'DropdownMenu.Trigger';
|
|
31
31
|
const MenuItems = ({ children }) => {
|
32
32
|
const props = useContext(MenuPropsContext);
|
33
33
|
const { contains } = useFilter({ sensitivity: 'base' });
|
34
|
-
const childrenWithIds =
|
34
|
+
const childrenWithIds = mapKeyToId(children);
|
35
35
|
const baseContent = (React.createElement(Base, { onAction: props.onAction, onSelectionChange: props.onSelectionChange, selectedKeys: props.selection, selectionMode: props.selectionMode, renderEmptyState: () => React.createElement(Base.EmptyStateContainer, null, props.emptyState) }, childrenWithIds));
|
36
36
|
return (React.createElement(Popover, { placement: props.placement },
|
37
37
|
React.createElement(Base.MenuContainer, { minHeight: props.minHeight, maxHeight: props.maxHeight, minWidth: props.minWidth, maxWidth: props.maxWidth },
|
@@ -53,21 +53,27 @@ DropdownMenu.Item = MenuItem;
|
|
53
53
|
DropdownMenu.Item.displayName = 'DropdownMenu.Item';
|
54
54
|
const MenuSection = (_a) => {
|
55
55
|
var { children } = _a, props = __rest(_a, ["children"]);
|
56
|
-
const childrenWithIds =
|
56
|
+
const childrenWithIds = mapKeyToId(children);
|
57
57
|
return React.createElement(Base.Group, Object.assign({}, props), childrenWithIds);
|
58
58
|
};
|
59
59
|
DropdownMenu.Section = MenuSection;
|
60
60
|
DropdownMenu.Section.displayName = 'DropdownMenu.Section';
|
61
61
|
// This function is used for backward compatibility with old DropdownMenu.Item keys.
|
62
62
|
// The old implementation used `key` prop to identify menu items, but the new implementation uses `id` prop.
|
63
|
-
const mapKeyToId = (
|
64
|
-
|
65
|
-
|
63
|
+
const mapKeyToId = (children) => {
|
64
|
+
return React.Children.map(children, (child) => {
|
65
|
+
var _a, _b;
|
66
|
+
if (typeof child === 'boolean' || child === null || child === undefined) {
|
67
|
+
return child;
|
68
|
+
}
|
69
|
+
// The are same cases where children is a React fragment, so we need to check for that as well.
|
70
|
+
if (React.isValidElement(child) && child.type === React.Fragment) {
|
71
|
+
return mapKeyToId(child.props.children);
|
72
|
+
}
|
73
|
+
if (isComponentType(child, MenuItem)) {
|
74
|
+
return React.cloneElement(child, { id: (_b = (_a = child.props.id) !== null && _a !== void 0 ? _a : child.key) !== null && _b !== void 0 ? _b : undefined });
|
75
|
+
}
|
66
76
|
return child;
|
67
|
-
}
|
68
|
-
if (isComponentType(child, MenuItem)) {
|
69
|
-
return React.cloneElement(child, { id: (_b = (_a = child.props.id) !== null && _a !== void 0 ? _a : child.key) !== null && _b !== void 0 ? _b : undefined });
|
70
|
-
}
|
71
|
-
return child;
|
77
|
+
});
|
72
78
|
};
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHJvcGRvd25NZW51LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21vbGVjdWxlcy9Ecm9wZG93bk1lbnUvRHJvcGRvd25NZW51LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsYUFBYSxFQUFFLFVBQVUsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUN6RCxPQUFPLEVBQ0wsWUFBWSxJQUFJLGdCQUFnQixFQUVoQyxXQUFXLElBQUksZUFBZSxFQUM5QixTQUFTLEdBQ1YsTUFBTSx1QkFBdUIsQ0FBQztBQUUvQixPQUFPLEVBQUUsWUFBWSxJQUFJLElBQUksRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxPQUFPLEVBQXlCLE1BQU0sMkJBQTJCLENBQUM7QUFDM0UsT0FBTyxFQUFFLFNBQVMsRUFBdUIsTUFBTSwrQkFBK0IsQ0FBQztBQUUvRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTlDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxlQUFlLENBQUM7QUE2SzVDLE1BQU0sZ0JBQWdCLEdBQUcsYUFBYSxDQUFzQyxFQUFFLENBQUMsQ0FBQztBQUVoRixNQUFNLENBQUMsTUFBTSxZQUFZLEdBS3JCLENBQUMsS0FBSyxFQUFFLEVBQUU7SUFDWixPQUFPLENBQ0wsb0JBQUMsZ0JBQWdCLENBQUMsUUFBUSxJQUFDLEtBQUssRUFBRSxLQUFLO1FBQ3JDLG9CQUFDLGVBQWUsSUFBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBRSxZQUFZLEVBQUUsS0FBSyxDQUFDLFlBQVksSUFDcEcsS0FBSyxDQUFDLFFBQVEsQ0FDQyxDQUNRLENBQzdCLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixZQUFZLENBQUMsV0FBVyxHQUFHLGNBQWMsQ0FBQztBQUUxQyxNQUFNLFdBQVcsR0FBdUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUU7SUFDdkUsTUFBTSxLQUFLLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDM0MsT0FBTyxDQUNMLG9CQUFDLFNBQVMscUJBQWUsTUFBTSxFQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsUUFBUSxJQUN2RCxRQUFRLENBQ0MsQ0FDYixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBRUYsWUFBWSxDQUFDLE9BQU8sR0FBRyxXQUFXLENBQUM7QUFDbkMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEdBQUcsc0JBQXNCLENBQUM7QUFFMUQsTUFBTSxTQUFTLEdBQXFDLENBQUMsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFO0lBQ25FLE1BQU0sS0FBSyxHQUFHLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxTQUFTLENBQUMsRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUV4RCxNQUFNLGVBQWUsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7SUFFN0MsTUFBTSxXQUFXLEdBQUcsQ0FDbEIsb0JBQUMsSUFBSSxJQUNILFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUN4QixpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCLEVBQzFDLFlBQVksRUFBRSxLQUFLLENBQUMsU0FBUyxFQUM3QixhQUFhLEVBQUUsS0FBSyxDQUFDLGFBQWEsRUFDbEMsZ0JBQWdCLEVBQUUsR0FBRyxFQUFFLENBQUMsb0JBQUMsSUFBSSxDQUFDLG1CQUFtQixRQUFFLEtBQUssQ0FBQyxVQUFVLENBQTRCLElBRTlGLGVBQWUsQ0FDWCxDQUNSLENBQUM7SUFFRixPQUFPLENBQ0wsb0JBQUMsT0FBTyxJQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUztRQUNqQyxvQkFBQyxJQUFJLENBQUMsYUFBYSxJQUNqQixTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVMsRUFDMUIsU0FBUyxFQUFFLEtBQUssQ0FBQyxTQUFTLEVBQzFCLFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUN4QixRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFFdkIsS0FBSyxDQUFDLE1BQU07WUFDYixvQkFBQyxJQUFJLENBQUMsMEJBQTBCO2dCQUM3QixLQUFLLENBQUMsVUFBVSxJQUFJLENBQ25CLG9CQUFDLGdCQUFnQixJQUFDLE1BQU0sRUFBRSxRQUFRO29CQUNoQyxvQkFBQyxXQUFXLGtCQUFZLG1CQUFtQixFQUFDLFNBQVMsRUFBQyxNQUFNLEdBQUc7b0JBQzlELFdBQVcsQ0FDSyxDQUNwQjtnQkFDQSxDQUFDLEtBQUssQ0FBQyxVQUFVLElBQUksV0FBVyxDQUNEO1lBQ2pDLEtBQUssQ0FBQyxNQUFNLENBQ00sQ0FDYixDQUNYLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixZQUFZLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztBQUMvQixZQUFZLENBQUMsS0FBSyxDQUFDLFdBQVcsR0FBRyxvQkFBb0IsQ0FBQztBQUV0RCxNQUFNLFFBQVEsR0FBRyxDQUFDLEtBQTRCLEVBQUUsRUFBRTtJQUNoRCxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsU0FBUyxJQUFJLENBQUMsT0FBTyxLQUFLLENBQUMsUUFBUSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDdkcsT0FBTyxvQkFBQyxJQUFJLENBQUMsSUFBSSxrQkFBQyxTQUFTLEVBQUUsU0FBUyxJQUFNLEtBQUssRUFBSSxDQUFDO0FBQ3hELENBQUMsQ0FBQztBQUVGLFlBQVksQ0FBQyxJQUFJLEdBQUcsUUFBUSxDQUFDO0FBQzdCLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBVyxHQUFHLG1CQUFtQixDQUFDO0FBRXBELE1BQU0sV0FBVyxHQUFHLENBQUMsRUFBZ0QsRUFBRSxFQUFFO1FBQXBELEVBQUUsUUFBUSxPQUFzQyxFQUFqQyxLQUFLLGNBQXBCLFlBQXNCLENBQUY7SUFDdkMsTUFBTSxlQUFlLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzdDLE9BQU8sb0JBQUMsSUFBSSxDQUFDLEtBQUssb0JBQUssS0FBSyxHQUFHLGVBQWUsQ0FBYyxDQUFDO0FBQy9ELENBQUMsQ0FBQztBQUVGLFlBQVksQ0FBQyxPQUFPLEdBQUcsV0FBVyxDQUFDO0FBQ25DLFlBQVksQ0FBQyxPQUFPLENBQUMsV0FBVyxHQUFHLHNCQUFzQixDQUFDO0FBSzFELG9GQUFvRjtBQUNwRiw0R0FBNEc7QUFDNUcsTUFBTSxVQUFVLEdBQUcsQ0FBQyxRQUFtRSxFQUFjLEVBQUU7SUFDckcsT0FBTyxLQUFLLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTs7UUFDNUMsSUFBSSxPQUFPLEtBQUssS0FBSyxTQUFTLElBQUksS0FBSyxLQUFLLElBQUksSUFBSSxLQUFLLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDeEUsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDO1FBRUQsK0ZBQStGO1FBQy9GLElBQUksS0FBSyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNqRSxPQUFPLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQXFFLENBQUMsQ0FBQztRQUN2RyxDQUFDO1FBRUQsSUFBSSxlQUFlLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUM7WUFDckMsT0FBTyxLQUFLLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFBLE1BQUEsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFLG1DQUFJLEtBQUssQ0FBQyxHQUFHLG1DQUFJLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDckYsQ0FBQztRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUMifQ==
|
package/dist/system.cjs
CHANGED
@@ -11281,7 +11281,7 @@ DropdownMenu2.Trigger.displayName = "DropdownMenu.Trigger";
|
|
11281
11281
|
var MenuItems = ({ children }) => {
|
11282
11282
|
const props = (0, import_react79.useContext)(MenuPropsContext);
|
11283
11283
|
const { contains } = (0, import_react_aria_components5.useFilter)({ sensitivity: "base" });
|
11284
|
-
const childrenWithIds =
|
11284
|
+
const childrenWithIds = mapKeyToId(children);
|
11285
11285
|
const baseContent = /* @__PURE__ */ import_react79.default.createElement(
|
11286
11286
|
DropdownMenu,
|
11287
11287
|
{
|
@@ -11315,19 +11315,24 @@ var MenuItem = (props) => {
|
|
11315
11315
|
DropdownMenu2.Item = MenuItem;
|
11316
11316
|
DropdownMenu2.Item.displayName = "DropdownMenu.Item";
|
11317
11317
|
var MenuSection = ({ children, ...props }) => {
|
11318
|
-
const childrenWithIds =
|
11318
|
+
const childrenWithIds = mapKeyToId(children);
|
11319
11319
|
return /* @__PURE__ */ import_react79.default.createElement(DropdownMenu.Group, { ...props }, childrenWithIds);
|
11320
11320
|
};
|
11321
11321
|
DropdownMenu2.Section = MenuSection;
|
11322
11322
|
DropdownMenu2.Section.displayName = "DropdownMenu.Section";
|
11323
|
-
var mapKeyToId = (
|
11324
|
-
|
11323
|
+
var mapKeyToId = (children) => {
|
11324
|
+
return import_react79.default.Children.map(children, (child) => {
|
11325
|
+
if (typeof child === "boolean" || child === null || child === void 0) {
|
11326
|
+
return child;
|
11327
|
+
}
|
11328
|
+
if (import_react79.default.isValidElement(child) && child.type === import_react79.default.Fragment) {
|
11329
|
+
return mapKeyToId(child.props.children);
|
11330
|
+
}
|
11331
|
+
if (isComponentType(child, MenuItem)) {
|
11332
|
+
return import_react79.default.cloneElement(child, { id: child.props.id ?? child.key ?? void 0 });
|
11333
|
+
}
|
11325
11334
|
return child;
|
11326
|
-
}
|
11327
|
-
if (isComponentType(child, MenuItem)) {
|
11328
|
-
return import_react79.default.cloneElement(child, { id: child.props.id ?? child.key ?? void 0 });
|
11329
|
-
}
|
11330
|
-
return child;
|
11335
|
+
});
|
11331
11336
|
};
|
11332
11337
|
|
11333
11338
|
// src/utils/object.ts
|
package/dist/system.mjs
CHANGED
@@ -11153,7 +11153,7 @@ DropdownMenu2.Trigger.displayName = "DropdownMenu.Trigger";
|
|
11153
11153
|
var MenuItems = ({ children }) => {
|
11154
11154
|
const props = useContext6(MenuPropsContext);
|
11155
11155
|
const { contains } = useFilter({ sensitivity: "base" });
|
11156
|
-
const childrenWithIds =
|
11156
|
+
const childrenWithIds = mapKeyToId(children);
|
11157
11157
|
const baseContent = /* @__PURE__ */ React71.createElement(
|
11158
11158
|
DropdownMenu,
|
11159
11159
|
{
|
@@ -11187,19 +11187,24 @@ var MenuItem = (props) => {
|
|
11187
11187
|
DropdownMenu2.Item = MenuItem;
|
11188
11188
|
DropdownMenu2.Item.displayName = "DropdownMenu.Item";
|
11189
11189
|
var MenuSection = ({ children, ...props }) => {
|
11190
|
-
const childrenWithIds =
|
11190
|
+
const childrenWithIds = mapKeyToId(children);
|
11191
11191
|
return /* @__PURE__ */ React71.createElement(DropdownMenu.Group, { ...props }, childrenWithIds);
|
11192
11192
|
};
|
11193
11193
|
DropdownMenu2.Section = MenuSection;
|
11194
11194
|
DropdownMenu2.Section.displayName = "DropdownMenu.Section";
|
11195
|
-
var mapKeyToId = (
|
11196
|
-
|
11195
|
+
var mapKeyToId = (children) => {
|
11196
|
+
return React71.Children.map(children, (child) => {
|
11197
|
+
if (typeof child === "boolean" || child === null || child === void 0) {
|
11198
|
+
return child;
|
11199
|
+
}
|
11200
|
+
if (React71.isValidElement(child) && child.type === React71.Fragment) {
|
11201
|
+
return mapKeyToId(child.props.children);
|
11202
|
+
}
|
11203
|
+
if (isComponentType(child, MenuItem)) {
|
11204
|
+
return React71.cloneElement(child, { id: child.props.id ?? child.key ?? void 0 });
|
11205
|
+
}
|
11197
11206
|
return child;
|
11198
|
-
}
|
11199
|
-
if (isComponentType(child, MenuItem)) {
|
11200
|
-
return React71.cloneElement(child, { id: child.props.id ?? child.key ?? void 0 });
|
11201
|
-
}
|
11202
|
-
return child;
|
11207
|
+
});
|
11203
11208
|
};
|
11204
11209
|
|
11205
11210
|
// src/utils/object.ts
|