react-dialogger 1.1.75 → 1.1.78

package/components/DialogBase.d.ts

@@ -1,7 +1,7 @@
-import { Component, ReactNode, RefObject } from 'react';
+import { Component, RefObject } from 'react';
 import { FormikProps } from "formik";
 import { DialogActionBase } from "./index.js";
-import { BaseDialogProps, BaseDialogState, IDialogSize, DialogOptionsType, TDialogCallbackFn, TDialogCallbackVoidFn, WithBackdrop, IInProcess, TInitialHolder, ISnackbarAnchor, TSeverity, DialogValues, TAccessFrom, ActionBaseDef, DialogContentFooterReturnType, DialogFormikAdapter } from "../types/index.js";
+import { BaseDialogProps, BaseDialogState, IDialogSize, DialogOptionsType, TDialogCallbackFn, TDialogCallbackVoidFn, WithBackdrop, IDialogSnackbar, IInProcess, TInitialHolder, ISnackbarAnchor, TSeverity, DialogValues, TAccessFrom, ActionApiDef, DialogContentFooterReturnType, DialogFormikAdapter } from "../types/index.js";
 import Dialog, { DialogAction } from "../models/index.js";
 interface IFormikAdapter extends Pick<FormikProps<any>, 'setValues' | 'setFieldValue' | 'values'> {
 }
@@ -66,18 +66,18 @@ declare class DialogBase<Values extends FormikProps<Values>> extends Component<B
     close: (callbackFn?: () => void) => void;
     focus: () => void;
     get actions(): {
-        [key: string]: ActionBaseDef;
+        [key: string]: ActionApiDef;
     };
     updateBody(body: TDialogCallbackFn): void;
     processingListener(listener: (inProcess: boolean) => void): this;
     getDom: () => HTMLDivElement;
     get snackbar(): {
-        open: (message: string, severity: TSeverity, key?: string, action?: ((key: string, snackbarRef: any) => ReactNode | void), autoHideDuration?: number | null) => void;
+        open: (message: string, severity: TSeverity, key?: string, action?: IDialogSnackbar["action"], autoHideDuration?: number | null) => void;
         openX: ({ message, severity, key, action, autoHideDuration }: {
             message: string;
             severity: TSeverity;
             key?: string;
-            action?: (key: string, snackbarRef: any) => ReactNode | void;
+            action?: IDialogSnackbar["action"];
             autoHideDuration?: number;
         }) => void;
         close: (key?: string) => void;

package/components/DialogBase.js

@@ -148,22 +148,24 @@ var DialogBase = /** @class */ (function (_super) {
             return _this._inProcess;
         };
         _this.close = function (callbackFn) {
-            var _a, _b, _c, _d;
-            if (_this._footerRef.current.inProcess) {
-                var notify = (_a = _this._dialogOptions.base.notifyOnClosing) !== null && _a !== void 0 ? _a : "snackbar";
-                if (notify === "snackbar") {
-                    var busyMessage = (_d = (_c = (_b = _this._dialogOptions) === null || _b === void 0 ? void 0 : _b.localText) === null || _c === void 0 ? void 0 : _c.busyMessage) !== null && _d !== void 0 ? _d : 'In Process, Please wait...';
-                    _this.snackbar.open(busyMessage, "warning");
+            setTimeout(function () {
+                var _a, _b, _c, _d;
+                if (_this._footerRef.current.inProcess) {
+                    var notify = (_a = _this._dialogOptions.base.notifyOnClosing) !== null && _a !== void 0 ? _a : "snackbar";
+                    if (notify === "snackbar") {
+                        var busyMessage = (_d = (_c = (_b = _this._dialogOptions) === null || _b === void 0 ? void 0 : _b.localText) === null || _c === void 0 ? void 0 : _c.busyMessage) !== null && _d !== void 0 ? _d : 'In Process, Please wait...';
+                        _this.snackbar.open(busyMessage, "warning");
+                    }
+                    else {
+                        _this._dialogWithBackDropRef.current.baseZoomEffect();
+                    }
+                    return;
                 }
-                else {
-                    _this._dialogWithBackDropRef.current.baseZoomEffect();
+                _this.kill(callbackFn);
+                if (typeof _this.props.onClose === "function") {
+                    _this.props.onClose(_this);
                 }
-                return;
-            }
-            _this.kill(callbackFn);
-            if (typeof _this.props.onClose === "function") {
-                _this.props.onClose(_this);
-            }
+            }, 150);
         };
         _this.focus = function () {
             if (_this._dialogRef.current) {
@@ -419,14 +421,19 @@ var DialogBase = /** @class */ (function (_super) {
             var s = (_a = this._snackbarRef) === null || _a === void 0 ? void 0 : _a.current;
             var sId = Math.random().toString(36).substring(2, 9);
             var openMe = function (message, severity, key, action, autoHideDuration) {
-                s === null || s === void 0 ? void 0 : s.enqueueSnackbar(message, __assign({ autoHideDuration: autoHideDuration !== undefined ? autoHideDuration : _this._dialogOptions.snackbar.autoHideDuration, variant: severity, 
+                s === null || s === void 0 ? void 0 : s.enqueueSnackbar(message, {
+                    autoHideDuration: autoHideDuration !== undefined ? autoHideDuration : _this._dialogOptions.snackbar.autoHideDuration,
+                    variant: severity,
                     // maxSnack: this._dialogOptions.snackbar.maxSnack,
-                    key: key !== null && key !== void 0 ? key : sId, anchorOrigin: {
+                    key: key !== null && key !== void 0 ? key : sId,
+                    anchorOrigin: {
                         vertical: _this._dialogOptions.snackbar.anchorOrigin.vertical,
                         horizontal: _this._dialogOptions.snackbar.anchorOrigin.horizontal,
-                    } }, action ? { action: function (key) {
-                        return action(key, s);
-                    } } : {}));
+                    },
+                    action: function (key) {
+                        return typeof action === "function" ? action(key, _this._snackbarRef) : action;
+                    }
+                });
             };
             var open = function (message, severity, key, action, autoHideDuration) {
                 openMe(message, severity, key, action, autoHideDuration);

package/components/DialogContentFooter.js

@@ -58,15 +58,15 @@ var DialogContentFooter = (0, react_1.forwardRef)(function (props, ref) {
     var dialogOptions = dialog.dialogOptions;
     var CustomFooter = (_a = dialogOptions.slot) === null || _a === void 0 ? void 0 : _a.footer;
     // Imperative handle
-    // const [inProcess, setInProcess] = React.useState(false);
-    var inProcess = false;
+    var _d = React.useState(false), inProcess = _d[0], setInProcess = _d[1];
+    var inProcessRef = React.useRef(inProcess);
     var setProcessing = function (processing) {
-        // setInProcess(processing);
-        inProcess = processing;
+        setInProcess(processing);
+        inProcessRef.current = processing;
     };
     React.useImperativeHandle(ref, function () { return ({
         setProcessing: setProcessing,
-        inProcess: inProcess
+        inProcess: inProcessRef.current
     }); });
     var staticProps = {
         dialogOptions: dialogOptions,

package/index.d.ts

@@ -5,4 +5,4 @@ export { default } from "./models/Dialog";
 export { DialogProcessing, DialogCloseAction, DialogFullscreenAction, DialogHeaderActionsWrapper, DialogInfoAction } from "./features";
 export { DialogAction, ActionProgress, baseDialogOptions } from "./models";
 export { InitDialogMemoizeBounds } from "./helpers";
-export { IDialogApiDef } from './types';
+export { IDialogApiDef, ActionApiDef } from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-dialogger",
-  "version": "1.1.75",
+  "version": "1.1.78",
   "description": "This package is a continuation of the react-araci package. Due to an error, react-araci was removed, and it has been decided to continue under the new package name react-dialogger",
   "main": "index.js",
   "author": "Sueleyman Topaloglu",

package/types/DialogActionTypes.d.ts

@@ -5,10 +5,10 @@ import { DialogAction } from "../models/index.js";
 import { CSSProperties } from "react";
 export type ActionDialogDef = Omit<IDialogApiDef, 'switchFullScreen'>;
 export type ActionDef = Pick<DialogAction, 'onClick' | 'setOptions' | 'name'>;
-export type ActionBaseDef = Pick<InstanceType<typeof DialogActionBase>, 'updateOptions' | 'updateColor' | 'updateVariant' | 'updateLabel' | 'updateIntent' | 'setOptions' | 'setInProcess' | 'getLabel' | 'options' | 'click' | 'remove' | 'name'>;
-export interface IDialogActionDef extends ActionBaseDef {
+export type ActionApiDef = Pick<InstanceType<typeof DialogActionBase>, 'updateOptions' | 'updateColor' | 'updateVariant' | 'updateLabel' | 'updateIntent' | 'setOptions' | 'setInProcess' | 'getLabel' | 'options' | 'click' | 'remove' | 'name'>;
+export interface IDialogActionDef extends ActionApiDef {
 }
-export type DialogActionType = (button: ActionBaseDef, dialog: Omit<IDialogApiDef, 'switchFullScreen'>) => void;
+export type DialogActionType = (button: ActionApiDef, dialog: Omit<IDialogApiDef, 'switchFullScreen'>) => void;
 export interface ActionProps {
     name: string;
     options?: DialogActionOptionsType;
@@ -62,7 +62,7 @@ export type DialogActionOptionsType = {
     style?: React.CSSProperties;
     baseStyle?: React.CSSProperties;
 };
-type TListenerButtonType = Pick<DialogActionBase, Exclude<keyof ActionBaseDef, 'onClick' | 'getStateListener' | 'name'>>;
+type TListenerButtonType = Pick<DialogActionBase, Exclude<keyof ActionApiDef, 'onClick' | 'getStateListener' | 'name'>>;
 export type TDialogStateListenerForActionCallbackType = (values: TValues, button: TListenerButtonType, dialog: IListenerDialogDef) => void;
 export interface IContentFooterProps {
 }

package/types/DialogTypes.d.ts

@@ -6,7 +6,7 @@ import type { FormikProps } from "formik";
 import type { RefObject } from "react";
 import { Resizeable } from "../helpers/index.js";
 import type { DialogContentFooterReturnType, IActionIntents } from "./DialogActionTypes";
-import { SnackbarKey, VariantType } from "notistack";
+import { SharedProps, SnackbarKey, SnackbarProvider, VariantType } from "notistack";
 export interface TBaseDialogState {
     [K: string]: any;
 }
@@ -176,7 +176,10 @@ export interface WithBackdrop {
     bodyRef: RefObject<any>;
     footerRef: RefObject<any>;
     prevDialogRect?: BaseDialogDOMRect;
-    snackbarRef: React.RefObject<any>;
+    snackbarRef: React.RefObject<SnackbarProvider>;
+}
+export interface IDialogSnackbar extends Omit<SharedProps, 'action'> {
+    action: React.ReactNode | ((key: SnackbarKey, snackbarRef: React.RefObject<SnackbarProvider>) => React.ReactNode);
 }
 export interface DialogWithBackdropWrapperRefProps {
     baseZoomEffect: () => void;