grep-components 1.24.0-GREPF-2082.1 → 1.24.0-GREPF-2126.1

package/dist/index.js

@@ -3235,7 +3235,7 @@ var CollapsableMenuItem = function (_a) {
                     return window.dispatchEvent(new Event('resize'));
                 });
             } }, items)))); };
-    return tooltipText ? (React__default.createElement(TooltipMenuItem, { className: classes.root, tooltipText: tooltipText, onMouseOver: function (e) { return e.currentTarget.focus(); }, disabled: disabled, selected: open, onClick: handleClick, onKeyDown: handleKey }, renderInner())) : (React__default.createElement(MenuItem, __assign({ className: classes.root, ref: listItemRef, selected: open, disabled: disabled, onClick: handleClick, onKeyDown: handleKey }, props), renderInner()));
+    return tooltipText ? (React__default.createElement(TooltipMenuItem, { className: classes.root, tooltipText: tooltipText, onMouseOver: function (e) { return e.currentTarget.focus(); }, disabled: disabled, selected: open, onClick: !disabled ? handleClick : undefined, onKeyDown: handleKey }, renderInner())) : (React__default.createElement(MenuItem, __assign({ className: classes.root, ref: listItemRef, selected: open, disabled: disabled, onClick: !disabled ? handleClick : undefined, onKeyDown: handleKey }, props), renderInner()));
 };
 
 var useStyles$f = makeStyles()(function (_a) {
@@ -3251,7 +3251,7 @@ var useStyles$f = makeStyles()(function (_a) {
 var DropdownMenu = function (_a) {
     var context = _a.context, menuItems = _a.menuItems, menuProps = __rest$1(_a, ["context", "menuItems"]);
     var classes = useStyles$f().classes;
-    var renderChild = function (level) {
+    var renderChild = function (level, parentDisabled) {
         if (level === void 0) { level = 0; }
         // eslint-disable-next-line react/display-name
         return function (item, index) {
@@ -3261,9 +3261,13 @@ var DropdownMenu = function (_a) {
             // ninja way, since rewriting existing code on lpu and admin is daunting
             props.onClick = function (e) {
                 menuProps.onClose && menuProps.onClose(e, 'backdropClick');
-                handleClick && handleClick(context);
+                handleClick && !disabled && handleClick(context);
             };
-            return (React__default.createElement(CollapsableMenuItem, __assign({ level: level, id: label, disabled: typeof disabled === 'function' ? disabled(context) : disabled, items: children === null || children === void 0 ? void 0 : children.map(renderChild(level + 1)) }, props),
+            return (React__default.createElement(CollapsableMenuItem, __assign({ level: level, id: label, disabled: parentDisabled
+                    ? true
+                    : typeof disabled === 'function'
+                        ? disabled(context)
+                        : disabled, items: children === null || children === void 0 ? void 0 : children.map(renderChild(level + 1, disabled)) }, props),
                 React__default.createElement("span", { style: { paddingLeft: "".concat(level * 0.5, "rem") } }, label)));
         };
     };
@@ -3751,13 +3755,9 @@ var GrepTable = function (_a) {
         var clickableRows = !!onRowClick;
         var disabled = isRowDisabled && isRowDisabled(row);
         var rowIndex = index + currentPage * rowsPerPage;
-        return (React__default.createElement(GrepTableRow, { key: rowIndex, "data-index": rowIndex, tabIndex: rowTabIndex !== null && rowTabIndex !== void 0 ? rowTabIndex : 0, hover: clickableRows, selected: rowIndex === selectedRowIndex, clickable: clickableRows, onMouseDown: function (e) {
-                if (e.target.type === 'checkbox') {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    return;
-                }
-                setSelectedElement(e.currentTarget);
+        return (React__default.createElement(GrepTableRow, { key: rowIndex, "data-index": rowIndex, tabIndex: rowTabIndex !== null && rowTabIndex !== void 0 ? rowTabIndex : 0, hover: clickableRows, selected: rowIndex === selectedRowIndex, clickable: clickableRows, onMouseDown: function (_a) {
+                var currentTarget = _a.currentTarget;
+                setSelectedElement(currentTarget);
                 if (!disableSelectOnClick) {
                     _handleRowClick(row);
                 }