dry-ux 1.25.0 → 1.27.0

package/dist/helpers/DajaxiceProxy.d.ts

@@ -1,9 +1,10 @@
 declare type Args<T> = {
-    args?: T;
+    args: T;
     skipAuthCheck?: boolean;
 };
 declare type Result<T = void> = T extends void ? Promise<any> : Promise<T>;
-export declare type DajaxiceFn<TArgs> = <TResult = void>(args?: Args<TArgs>) => Result<TResult>;
+declare type ArgType<T> = T extends void ? Omit<Args<any>, "args"> | void : Args<T>;
+export declare type DajaxiceFn<TArgs = void> = <TResult = void>(args: ArgType<TArgs>) => Result<TResult>;
 /**
  * This function is used to create a type safe proxy for the Dajaxice functions.
  * @param modules: The modules object from the Dajaxice generated file.

package/dist/helpers/DajaxiceProxy.test.d.ts

@@ -10,6 +10,7 @@ export declare type DajaxiceModules = {
         setName: DajaxiceFn<{
             name: string;
         }>;
-        getName: DajaxiceFn<{}>;
+        getName: DajaxiceFn;
+        getCity: DajaxiceFn;
     };
 };

package/dist/helpers/DajaxiceProxy.test.js

@@ -15,3 +15,6 @@ Api.organization.setName({ args: { name: "test" } }).then(res => {
 Api.organization.getName().then(res => {
     console.log(res);
 });
+Api.organization.getCity().then(res => {
+    console.log(res);
+});

package/dist/ui-utils/Modal.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const React = require("react");
 const react_bootstrap_1 = require("react-bootstrap");
-const Modal = React.memo(({ handleClose, shown, options: { content, cssClass, closeBtn, title, width, onClose, titleCloseBtn = true } }) => {
+const Modal = React.memo(({ handleClose, shown, options: { content, footerContent, cssClass, closeBtn, title, width, onClose, titleCloseBtn = true }, }) => {
     React.useEffect(() => {
         if (shown) {
             $(".modal-dialog").css("width", width);
@@ -15,10 +15,13 @@ const Modal = React.memo(({ handleClose, shown, options: { content, cssClass, cl
         onClose && onClose();
     };
     const contentToRender = typeof content == "string" ? React.createElement("div", { dangerouslySetInnerHTML: { __html: content } }) : content;
+    const showFooter = closeBtn || footerContent;
     return (React.createElement(react_bootstrap_1.Modal, { onHide: hide, show: shown, animation: true, autoFocus: true, keyboard: false, className: cssClass, backdropStyle: { zIndex: 1040, opacity: 0.5 }, backdrop: "static" },
         !!title && (React.createElement(react_bootstrap_1.Modal.Header, { closeButton: titleCloseBtn, onHide: hide },
             React.createElement(react_bootstrap_1.Modal.Title, null, title))),
         React.createElement(react_bootstrap_1.Modal.Body, null, contentToRender),
-        React.createElement(react_bootstrap_1.Modal.Footer, null, closeBtn && (React.createElement(react_bootstrap_1.Button, { bsClass: "btn btn-danger", onClick: hide }, "Close")))));
+        showFooter && (React.createElement(react_bootstrap_1.Modal.Footer, null,
+            footerContent,
+            closeBtn && (React.createElement(react_bootstrap_1.Button, { bsClass: "btn btn-danger", onClick: hide }, "Close"))))));
 });
 exports.default = Modal;

package/dist/ui-utils/UIUtilProvider.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIUtilProvider = exports.useUIUtilContext = exports.UIUtilContext = void 0;
 const React = require("react");
 require("../types");
+const react_bootstrap_1 = require("react-bootstrap");
 const defaultState = {
     modal: {
         show: null,
@@ -41,16 +42,15 @@ class UIUtilProvider extends React.PureComponent {
                 destroyOnClose: true,
                 closeBtn: true,
                 width: 400,
-            }), showConfirm: (options, onYes, onNo) => this.createModal("confirm", Object.assign(Object.assign({}, options), { content: (React.createElement("div", null,
-                    options.content,
-                    React.createElement("div", { className: "text-center mtop" },
-                        React.createElement("button", { className: "btn btn-success mright", onClick: onYes }, "Yes"),
-                        React.createElement("button", { className: "btn btn-danger", onClick: () => (onNo ? onNo() : this.toggleModalInstance("confirm", false, true)) }, "No")))) })), showActions: (options, actions) => this.createModal("actions", Object.assign(Object.assign({}, options), { content: (React.createElement("div", null,
-                    options.content,
-                    React.createElement("div", { className: "text-center mtop" }, actions.map(({ content, type = "success", closeOnClick, onClick }, index) => (React.createElement("button", { className: `btn btn-${type} mright`, onClick: () => {
+            }), showConfirm: (options, onYes, onNo) => this.createModal("confirm", Object.assign(Object.assign({}, options), { footerContent: (React.createElement(React.Fragment, null,
+                    options.footerContent,
+                    React.createElement(react_bootstrap_1.Button, { bsClass: "btn btn-success mright", onClick: onYes }, "Yes"),
+                    React.createElement(react_bootstrap_1.Button, { bsClass: "btn btn-danger", onClick: () => (onNo ? onNo() : this.toggleModalInstance("confirm", false, true)) }, "No"))) })), showActions: (options, actions) => this.createModal("actions", Object.assign(Object.assign({}, options), { footerContent: (React.createElement(React.Fragment, null,
+                    options.footerContent,
+                    actions.map(({ content, type = "success", closeOnClick, onClick }, index) => (React.createElement(react_bootstrap_1.Button, { bsClass: `btn btn-${type} mright`, onClick: () => {
                             onClick && onClick();
                             closeOnClick && this.toggleModalInstance("actions", false, true);
-                        } }, content)))))) })) });
+                        } }, content))))) })) });
     }
     get alertDefaults() {
         return {

package/dist/ui-utils/uiUtil.interface.d.ts

@@ -18,6 +18,10 @@ export declare type ModalOptions = {
      * The content of the modal.
      */
     content: JSX.Element | string;
+    /**
+     * Footer content of the modal.
+     */
+    footerContent?: JSX.Element | string;
     /**
      * The class to apply to the modal.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dry-ux",
-  "version": "1.25.0",
+  "version": "1.27.0",
   "description": "",
   "main": "dist/index",
   "scripts": {