@mmb-digital/ds-lilly 0.10.36 → 0.10.38

package/dist/ds-lilly.js

@@ -98729,6 +98729,9 @@ var Dropdown2 = function (_a) {
         var arrayNodes = toArray(nodes);
         return arrayNodes.reduce(function (acc, current) {
             var _a, _b;
+            if (Array.isArray(current)) {
+                getMenuItems(current).forEach(function (child) { return acc.push(child); });
+            }
             if (external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_default.a.isValidElement(current)) {
                 if (current.type === Dropdown2Item || current.type === Dropdown2Divider) {
                     acc.push(current);
@@ -98752,7 +98755,7 @@ var Dropdown2 = function (_a) {
         tooltipRef.current = ref;
         setTooltipRef(ref);
     };
-    var isItemDisabled = Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["useCallback"])(function (item) { var _a, _b; return ((_a = item === null || item === void 0 ? void 0 : item.props) === null || _a === void 0 ? void 0 : _a.isDisabled) === true || ((_b = item === null || item === void 0 ? void 0 : item.type) === null || _b === void 0 ? void 0 : _b.displayName) !== 'Dropdown2Item'; }, []);
+    var isItemDisabled = Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["useCallback"])(function (item) { var _a; return ((_a = item === null || item === void 0 ? void 0 : item.props) === null || _a === void 0 ? void 0 : _a.isDisabled) === true || item.type !== Dropdown2Item; }, []);
     var detectSelectedItemIndex = Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["useCallback"])(function () {
         return menuItems.reduce(function (acc, item, index) {
             var _a;
@@ -98763,6 +98766,7 @@ var Dropdown2 = function (_a) {
         }, undefined);
     }, [menuItems]);
     var getNextActiveItemIndex = Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["useCallback"])(function (fromIndex) {
+        if (fromIndex === void 0) { fromIndex = 0; }
         return menuItems.reduce(function (acc, item, index) {
             if (acc === undefined && index > fromIndex && !isItemDisabled(item)) {
                 acc = index;
@@ -98794,7 +98798,7 @@ var Dropdown2 = function (_a) {
             onScrollToEnd && onScrollToEnd();
         }
     };
-    var handleKeyUp = Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["useCallback"])(function (event) {
+    var handleKeyDown = Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["useCallback"])(function (event) {
         var key = event.key;
         switch (key) {
             case KEYS.Tab:
@@ -98834,6 +98838,13 @@ var Dropdown2 = function (_a) {
                 event.preventDefault();
                 setFocusedItemIndex(menuItems.length - 1);
                 break;
+            case KEYS.Enter:
+            case KEYS.Space:
+                event.preventDefault();
+                var menuItem = menuItems[focusedItemIndex];
+                if (menuItem && menuItem.props.onKeyDown) {
+                    menuItem.props.onKeyDown(event);
+                }
         }
     }, [
         visible,
@@ -98850,7 +98861,7 @@ var Dropdown2 = function (_a) {
         'aria-haspopup': true,
         'aria-controls': forceDropdownId,
         'aria-expanded': false,
-        onKeyUp: handleKeyUp
+        onKeyDown: handleKeyDown
     };
     if (visible) {
         triggerComponentProps['aria-expanded'] = true;
@@ -98879,13 +98890,14 @@ var Dropdown2 = function (_a) {
             external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_default.a.createElement("div", Dropdown2_assign({ ref: setRef, "data-testid": testId }, getTooltipProps({
                 className: classBinder_cx('c-dropdown', { 'c-dropdown--fullWidth': hasSameWidthAsTrigger }, theme)
             }), { onBlur: onBlur, onScroll: handleScroll }),
-                external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_default.a.createElement("ul", { ref: menuRef, "aria-activedescendant": focusedItemIndex !== -1 ? forceDropdownId + "-menuItem-" + focusedItemIndex : '', "aria-hidden": false, "aria-multiselectable": false, className: classBinder_cx('c-dropdown__menu', theme), "data-testid": testId, id: forceDropdownId, role: "listbox", tabIndex: 0, onBlur: onBlur, onKeyUp: handleKeyUp }, menuItems.map(function (menuItem, index) {
+                external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_default.a.createElement("ul", { ref: menuRef, "aria-activedescendant": focusedItemIndex !== -1 ? forceDropdownId + "-menuItem-" + focusedItemIndex : '', "aria-hidden": false, "aria-multiselectable": false, className: classBinder_cx('c-dropdown__menu', theme), "data-testid": testId, id: forceDropdownId, role: "listbox", tabIndex: 0, onBlur: onBlur, onKeyDown: handleKeyDown }, menuItems.map(function (menuItem, index) {
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore
                     return Object(external_root_React_commonjs2_react_commonjs_react_amd_react_umd_react_["cloneElement"])(menuItem, {
                         key: "menuItem-" + index,
                         id: forceDropdownId + "-menuItem-" + index,
                         isFocused: focusedItemIndex === index,
+                        onKeyDown: handleKeyDown,
                         onMouseOver: function () { return setFocusedItemIndex(index); }
                     });
                 }))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmb-digital/ds-lilly",
-  "version": "0.10.36",
+  "version": "0.10.38",
   "description": "MMB LILLY design system",
   "license": "UNLICENSED",
   "sideEffects": false,