react-dialogger 1.1.134 → 1.1.136

package/components/DialogBase.d.ts

@@ -70,7 +70,7 @@ declare class DialogBase<V, I> extends Component<BaseDialogProps<V, I>, BaseDial
         [key: string]: ActionApiDef;
     };
     updateBody(body: TDialogCallbackFn<V, I>): void;
-    processingListener(listener: (inProcess: boolean) => void): this;
+    processingListener(listener: (inProcess: boolean, message: string) => void): this;
     onAbort(callbackFn: TDialogCallbackFn<V, I, void>): this;
     getDom: () => HTMLDivElement;
     get snackbar(): {

package/components/DialogBase.js

@@ -88,14 +88,13 @@ var DialogBase = /** @class */ (function (_super) {
         _this.setInProcess = function (process, message, holder) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             _this._inProcess = __assign({ inProcess: process }, message ? { message: message } : {});
-            if (!process) {
-                _this._holder = null;
-            }
-            else {
-                if (holder) {
-                    _this._holder = holder;
-                }
-            }
+            // if(!process){
+            //     this._holder = null;
+            // } else {
+            //     if(holder){
+            //         this._holder =  holder;
+            //     }
+            // }
             if ((_b = (_a = _this._dialogOptions.base) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.disabledOnDialogProcessing) {
                 if (process) {
                     for (var actionKey in _this._actionRefs) {
@@ -125,7 +124,7 @@ var DialogBase = /** @class */ (function (_super) {
             for (var _i = 0, _m = _this._processingListeners; _i < _m.length; _i++) {
                 var listener = _m[_i];
                 if (typeof listener === "function") {
-                    listener(process);
+                    listener(process, message);
                 }
             }
             console.log('setInProcess_process', process);

package/components/DialogContentBody.js

@@ -104,24 +104,28 @@ var PlaceholderWrapper = function (_a) {
     var _d = (_b = dialog.dialogOptions.slotProps.loader) !== null && _b !== void 0 ? _b : { message: null }, message = _d.message, loading = _d.loading;
     var _e = React.useState({
         message: message,
-        inProcess: typeof loading === "boolean" ? loading : true
+        loading: typeof loading === "boolean" ? loading : true
     }), inProcess = _e[0], setInProcess = _e[1];
     React.useEffect(function () {
-        var unsubscribe = dialog.processingListener(function (processing) {
-            setInProcess(dialog.isInProcess());
+        dialog.processingListener(function (processing, message) {
+            console.log('PlaceholderWrapper_useEffect_processingListener', processing, message);
+            setInProcess({
+                message: message,
+                loading: processing
+            });
         });
-        // return () => (unsubscribe as any)?.()
-    }, []);
+    }, [dialog]);
     var initialElement = React.useState(function () {
         if (!children)
             return null;
         return React.isValidElement(children) ? children : React.createElement(children, {});
     })[0];
+    console.log('PlaceholderWrapper_useEffect_processingListener_2', inProcess.loading);
     var LoaderSlotElement = initialElement
         ? React.cloneElement(initialElement, __assign(__assign({}, dialog.dialogOptions.slotProps.loader), { values: dialog.values, inProcess: dialog.isInProcess() }))
         : null;
     var backgroundColor = (_c = dialogOptions.base.style.backgroundColor) !== null && _c !== void 0 ? _c : "#FFFFFF";
-    return (0, jsx_runtime_1.jsx)("div", { className: 'dialog-content-placeholder', style: { display: inProcess.inProcess ? 'flex' : 'none', backgroundColor: backgroundColor }, children: LoaderSlotElement });
+    return (0, jsx_runtime_1.jsx)("div", { className: 'dialog-content-placeholder', style: { display: inProcess.loading ? 'flex' : 'none', backgroundColor: backgroundColor }, children: LoaderSlotElement });
 };
 // const DialogContentBody: React.FC<IContentBodyProps> = React.forwardRef(({
 //         body
@@ -140,23 +144,29 @@ var DialogContentBody = React.forwardRef(function (_a, ref) {
         setProcessing: setProcessing,
         inProcess: inProcess
     }); });
-    // const LoaderSlotElement = dialog.holder ? React.isValidElement(dialog.holder)
-    //     ? React.cloneElement( dialog.holder as React.ReactElement<DialogOptionsType['slotProps']['loader'] & {dialog: IDialogApiDef}>, {
-    //         ...dialog.dialogOptions.slotProps.loader,
-    //         dialog
-    //     })
-    //     : React.createElement(dialog.holder as JSXElementConstructor<DialogOptionsType['slotProps']['loader'] & {dialog: IDialogApiDef}>, {
-    //         ...dialog.dialogOptions.slotProps.loader,
-    //         dialog
-    //     }) : null
-    console.log('LoaderSlotElement', dialog.isInProcess());
-    if (body instanceof Function) {
-        return (0, jsx_runtime_1.jsxs)("div", { className: 'dialog-body', style: { height: '100%' }, children: [dialog.holder && (0, jsx_runtime_1.jsx)(PlaceholderWrapper, { dialog: dialog, dialogOptions: dialog.dialogOptions, children: dialog.holder }), body(dialog)] });
-    }
-    return (0, jsx_runtime_1.jsx)("div", { className: 'dialog-body', style: { height: '100%', padding: 10 }, children: dialog.holder ?
-            // <Placeholder dialogOptions={dialog.dialogOptions} placeholder={dialog.holder} />
-            (0, jsx_runtime_1.jsx)(PlaceholderWrapper, { dialog: dialog, dialogOptions: dialog.dialogOptions, children: dialog.holder })
-            :
-                body });
+    return (0, jsx_runtime_1.jsxs)("div", { className: 'dialog-body', style: { height: '100%' }, children: [dialog.holder &&
+                (0, jsx_runtime_1.jsx)(PlaceholderWrapper, { dialog: dialog, dialogOptions: dialog.dialogOptions, children: dialog.holder }), body(dialog)] });
+    // if(body instanceof Function){
+    //     return <div className={'dialog-body'} style={{ height: '100%'}}>
+    //         {/*{dialog.holder && <Placeholder dialogOptions={dialog.dialogOptions} placeholder={dialog.holder} />}*/}
+    //         {
+    //             dialog.holder &&
+    //             <PlaceholderWrapper dialog={dialog} dialogOptions={dialog.dialogOptions}>
+    //                 {dialog.holder as any}
+    //             </PlaceholderWrapper>
+    //         }
+    //         {body(dialog)}
+    //     </div>
+    // }
+    // return <div className={'dialog-body'} style={{height: '100%', padding: 10}} >
+    //     {
+    //         dialog.holder ?
+    //             // <Placeholder dialogOptions={dialog.dialogOptions} placeholder={dialog.holder} />
+    //             <PlaceholderWrapper dialog={dialog} dialogOptions={dialog.dialogOptions}>
+    //                 {dialog.holder as any}
+    //             </PlaceholderWrapper>
+    //             :
+    //             body }
+    // </div>
 });
 exports.DialogContentBody = DialogContentBody;

package/models/Dialog.d.ts

@@ -4,6 +4,8 @@ import { TInitialHolder, IDialogSize, TDialogStateListenerCallbackType, DialogOp
 declare class Dialog<V, I> {
     private _initialValues?;
     private _inject?;
+    private static _globalWrapper?;
+    static setGlobalWrapper(wrapper: React.ComponentType): void;
     private readonly _processingListeners;
     private readonly _abortedListeners;
     private _stateListener;

package/models/Dialog.js

@@ -107,6 +107,9 @@ var Dialog = /** @class */ (function () {
         }
         // this._xrefs = {} as DialogExternalRefs<StockDialogRefs>;
     }
+    Dialog.setGlobalWrapper = function (wrapper) {
+        Dialog._globalWrapper = wrapper;
+    };
     Dialog.prototype.inject = function (args) {
         // @ts-ignore
         var t = new Dialog(this._apiRef, this._dialogOptions, this._initialValues, args);
@@ -200,7 +203,12 @@ var Dialog = /** @class */ (function () {
         // root.render( React.createElement( DialogBase as React.ComponentType<
         //     typeof this._initialValues
         // >, props ) );
-        root.render(React.createElement(DialogBase_1.default, props));
+        // root.render( React.createElement( DialogBase as React.ComponentType<BaseDialogProps<Values, I>>, props ) );
+        var element = React.createElement(DialogBase_1.default, props);
+        // Wrapper varsa sar, yoksa direkt render
+        root.render(Dialog._globalWrapper
+            ? React.createElement(Dialog._globalWrapper, null, element)
+            : element);
     };
     return Dialog;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-dialogger",
-  "version": "1.1.134",
+  "version": "1.1.136",
   "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/DialogTypes.d.ts

@@ -50,7 +50,7 @@ export interface BaseDialogProps<V extends Record<string, any>, I> {
     root?: any;
     keyboardListener: (key: string, dialog: IDialogApiDef<V, I>) => void;
     resizeListener?: (size: IDialogSize, dialog: IDialogApiDef<V, I>) => void;
-    processingListeners?: Array<(inProcess: boolean) => void>;
+    processingListeners?: Array<(inProcess: boolean, message: string) => void>;
     abortedListeners?: Array<(dialog: IDialogApiDef<V, I>) => void>;
     zFinder: () => number;
 }