@mezzanine-ui/react 0.12.5 → 0.12.7

package/Modal/ModalActions.js

@@ -10,9 +10,10 @@ import ConfirmActions from '../ConfirmActions/ConfirmActions.js';
  */
 const ModalActions = forwardRef(function ModalActions(props, ref) {
     const { cancelButtonProps, cancelText, children, confirmButtonProps, confirmText, hideCancelButton, hideConfirmButton, onCancel, onConfirm, ...rest } = props;
+    const { loading: confirmButtonLoading, ...restConfirmButtonProps } = confirmButtonProps || {};
     const { loading, severity, } = useContext(ModalControlContext);
     const danger = severity === 'error';
-    return (jsxs(ModalFooter, { ...rest, ref: ref, children: [children, jsx(ConfirmActions, { cancelButtonProps: cancelButtonProps, cancelText: cancelText, className: modalClasses.actions, confirmButtonProps: confirmButtonProps, confirmText: confirmText, danger: danger, hideCancelButton: hideCancelButton, hideConfirmButton: hideConfirmButton, loading: loading, onCancel: onCancel, onConfirm: onConfirm })] }));
+    return (jsxs(ModalFooter, { ...rest, ref: ref, children: [children, jsx(ConfirmActions, { cancelButtonProps: cancelButtonProps, cancelText: cancelText, className: modalClasses.actions, confirmButtonProps: restConfirmButtonProps, confirmText: confirmText, danger: danger, hideCancelButton: hideCancelButton, hideConfirmButton: hideConfirmButton, loading: confirmButtonLoading !== null && confirmButtonLoading !== void 0 ? confirmButtonLoading : loading, onCancel: onCancel, onConfirm: onConfirm })] }));
 });
 var ModalActions$1 = ModalActions;
 

package/Table/rowSelection/TableRowSelection.js

@@ -12,7 +12,7 @@ import Icon from '../../Icon/Icon.js';
 import cx from 'clsx';
 
 const TableRowSelection = forwardRef(function TableRowSelection(props, ref) {
-    var _a;
+    var _a, _b;
     const { rowKey, setChecked, showDropdownIcon, ...rest } = props;
     const { rowSelection, expanding, } = useContext(TableContext) || {};
     const { dataSource = [], } = useContext(TableDataContext) || {};
@@ -72,14 +72,14 @@ const TableRowSelection = forwardRef(function TableRowSelection(props, ref) {
     const actionMenu = (jsx(Menu, { size: "medium", children: ((_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.actions) !== null && _a !== void 0 ? _a : []).map(((action) => (jsx(MenuItem, { className: action.className, onClick: (evt) => onMenuItemClicked(evt, action), children: action.text }, action.key)))) }));
     return (jsxs("div", { ref: ref, ...rest, className: tableClasses.selections, style: hiddenIconWithExpandableStyle.host, children: [jsx(Checkbox, { checked: checked, disabled: false, indeterminate: indeterminate, inputProps: {
                     name,
-                }, onChange: onSelected, size: "medium" }), jsx("div", { className: tableClasses.icon, style: hiddenIconWithExpandableStyle.icon, children: showDropdownIcon ? (jsx(Dropdown, { menu: actionMenu, onClose: () => toggleOpen(false), popperProps: {
+                }, onChange: onSelected, size: "medium" }), ((_b = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.actions) === null || _b === void 0 ? void 0 : _b.length) ? (jsx("div", { className: tableClasses.icon, style: hiddenIconWithExpandableStyle.icon, children: showDropdownIcon ? (jsx(Dropdown, { menu: actionMenu, onClose: () => toggleOpen(false), popperProps: {
                         open,
                         options: {
                             placement: 'bottom-start',
                         },
                     }, children: (dropdownRef) => (jsx(Icon, { ref: dropdownRef, className: cx(tableClasses.icon, {
                             [tableClasses.iconClickable]: isMenuAllowOpen,
-                        }), color: isMenuAllowOpen ? 'primary' : 'disabled', icon: MoreVerticalIcon, onClick: onIconClicked })) })) : null })] }));
+                        }), color: isMenuAllowOpen ? 'primary' : 'disabled', icon: MoreVerticalIcon, onClick: onIconClicked })) })) : null })) : null] }));
 });
 var TableRowSelection$1 = TableRowSelection;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezzanine-ui/react",
-  "version": "0.12.5",
+  "version": "0.12.7",
   "description": "React components for mezzanine-ui",
   "author": "Mezzanine",
   "repository": {
@@ -31,9 +31,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@mezzanine-ui/core": "^0.12.5",
-    "@mezzanine-ui/icons": "^0.12.5",
-    "@mezzanine-ui/system": "^0.12.5",
+    "@mezzanine-ui/core": "^0.12.7",
+    "@mezzanine-ui/icons": "^0.12.7",
+    "@mezzanine-ui/system": "^0.12.7",
     "@popperjs/core": "^2.11.6",
     "@types/react-transition-group": "^4.4.5",
     "clsx": "^1.2.1",