@cashub/ui 0.48.13 → 0.48.15

package/Tab/TabTab.js

@@ -10,7 +10,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _TabContext = _interopRequireDefault(require("./subComponent/TabContext"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2, _templateObject3;
-const _excluded = ["children", "name", "title"];
+const _excluded = ["children", "name", "title", "onClick"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -24,7 +24,8 @@ const TabTab = _ref => {
   let {
       children,
       name,
-      title
+      title,
+      onClick
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const {
@@ -39,7 +40,10 @@ const TabTab = _ref => {
     if (selected !== name) {
       onChange(name);
     }
-  }, [name, selected, onChange]);
+    if (onClick && typeof onClick === 'function') {
+      onClick();
+    }
+  }, [name, selected, onChange, onClick]);
   const handleDoubleClick = () => {
     if (mode !== 'modify') return;
     setIsModify(true);

package/modal/StateModal.js

@@ -16,7 +16,8 @@ var _Button = _interopRequireDefault(require("../button/Button"));
 var _ModalBackdrop = _interopRequireDefault(require("../backdrop/ModalBackdrop"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-const _excluded = ["onClose"];
+const _excluded = ["onClose"],
+  _excluded2 = ["text", "children", "type", "onClick", "closeOnClick"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -51,6 +52,7 @@ const ModalContent = _ref2 => {
     type,
     title,
     text,
+    buttons,
     confirmButtonText,
     cancelButtonText,
     showConfirmButton = true,
@@ -68,18 +70,30 @@ const ModalContent = _ref2 => {
   if (type === 'error') Icon = _fa.FaRegTimesCircle;
   if (type === 'danger') Icon = _bs.BsExclamationTriangle;
   if (type === 'warning') Icon = _bs.BsExclamationCircle;
+  const getButtonTypeProps = buttonType => _objectSpread(_objectSpread(_objectSpread({}, buttonType === 'danger' && {
+    danger: true
+  }), buttonType === 'warning' && {
+    warning: true
+  }), buttonType === 'success' && {
+    success: true
+  });
   const handleDismiss = event => {
     if (event.target === refWrapper.current && allowDismiss === true) {
       onClose();
     }
   };
-  const handleConfirm = () => {
-    if (onConfirm) onConfirm();
-    onClose();
-  };
-  const handleCancel = () => {
-    if (onCancel) onCancel();
-    onClose();
+  const modalButtons = buttons || [showCancelButton === true && {
+    text: cancelButtonText || 'Cancel',
+    type: cancelButtonType,
+    onClick: onCancel
+  }, showConfirmButton === true && {
+    text: confirmButtonText || 'Confirm',
+    type: confirmButtonType,
+    onClick: onConfirm
+  }].filter(Boolean);
+  const handleButtonClick = button => {
+    if (button.onClick) button.onClick();
+    if (button.closeOnClick !== false) onClose();
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {
     ref: refWrapper,
@@ -96,33 +110,35 @@ const ModalContent = _ref2 => {
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Message, {
           children: text
         })]
-      }), (showCancelButton === true || showConfirmButton === true) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.default, {
+      }), modalButtons.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ButtonGroup.default, {
         alignRight: true,
-        children: [showCancelButton === true && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread(_objectSpread({}, cancelButtonType === 'danger' && {
-          danger: true
-        }), cancelButtonType === 'warning' && {
-          warning: true
-        }), {}, {
-          onClick: handleCancel,
-          children: cancelButtonText || 'Cancel'
-        })), showConfirmButton === true && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread(_objectSpread({}, confirmButtonType === 'success' && {
-          success: true
-        }), confirmButtonType === 'warning' && {
-          warning: true
-        }), {}, {
-          onClick: handleConfirm,
-          children: confirmButtonText || 'Confirm'
-        }))]
+        children: modalButtons.map((_ref3, index) => {
+          let {
+              text: buttonText,
+              children,
+              type: buttonType,
+              onClick,
+              closeOnClick
+            } = _ref3,
+            buttonProps = _objectWithoutProperties(_ref3, _excluded2);
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread(_objectSpread({}, getButtonTypeProps(buttonType)), buttonProps), {}, {
+            onClick: () => handleButtonClick({
+              onClick,
+              closeOnClick
+            }),
+            children: children || buttonText
+          }), "".concat(id, "-Button-").concat(index));
+        })
       })]
     })
   });
 };
 const Wrapper = (0, _styledComponents.default)(_ModalBackdrop.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  z-index: 90;\n"])));
 const Container = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 500px;\n  max-width: 90%;\n  background: var(--color-background2);\n  box-shadow: var(--box-shadow);\n  padding: var(--spacing);\n  border-radius: var(--border-radius);\n  color: var(--font-on-background);\n  border: var(--border-width) solid var(--border-color);\n  text-align: center;\n"])));
-const Body = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  margin-bottom: var(--spacing);\n\n  > svg {\n    font-size: 120px;\n    margin-bottom: var(--spacing);\n\n    ", "\n  }\n"])), _ref3 => {
+const Body = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  margin-bottom: var(--spacing);\n\n  > svg {\n    font-size: 120px;\n    margin-bottom: var(--spacing);\n\n    ", "\n  }\n"])), _ref4 => {
   let {
     type
-  } = _ref3;
+  } = _ref4;
   switch (type) {
     case 'error':
     case 'danger':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cashub/ui",
-  "version": "0.48.13",
+  "version": "0.48.15",
   "private": false,
   "author": "CasHUB Team",
   "description": "CasHUB UI components library",