react-dialogger 1.1.99 → 1.1.100

package/components/DialogBase.d.ts

@@ -1,12 +1,13 @@
 import { Component, RefObject } from 'react';
 import { FormikProps } from "formik";
 import { DialogActionBase } from "./index.js";
-import { BaseDialogProps, BaseDialogState, IDialogSize, DialogOptionsType, TDialogCallbackFn, TDialogCallbackVoidFn, WithBackdrop, IDialogSnackbar, IInProcess, TInitialHolder, ISnackbarAnchor, TSeverity, TAccessFrom, ActionApiDef, DialogContentFooterReturnType, DialogFormikAdapter, DialogHandlers, DialogHandlerFn, DialogValues, ModelDialogValues } from "../types/index.js";
+import { BaseDialogProps, BaseDialogState, IDialogSize, DialogOptionsType, TDialogCallbackFn, TDialogCallbackVoidFn, WithBackdrop, IDialogSnackbar, IInProcess, TInitialHolder, ISnackbarAnchor, TSeverity, TAccessFrom, ActionApiDef, DialogContentFooterReturnType, DialogFormikAdapter, DialogHandlers, DialogHandlerFn, Dialogify } from "../types/index.js";
 import Dialog, { DialogAction } from "../models/index.js";
 interface IFormikAdapter extends Pick<FormikProps<any>, 'setValues' | 'setFieldValue' | 'values'> {
 }
 type FeatureType = Partial<Record<string, any>>;
-declare class DialogBase<Values extends DialogValues<Record<string, any>>> extends Component<BaseDialogProps, BaseDialogState> {
+declare class DialogBase<Values extends Record<string, any>> extends Component<BaseDialogProps<Values>, BaseDialogState> {
+    protected _initialValues: Dialogify<Values>;
     _dialogTranslate: {
         lastX: number;
         lastY: number;
@@ -29,7 +30,6 @@ declare class DialogBase<Values extends DialogValues<Record<string, any>>> exten
     protected _onClose: TDialogCallbackVoidFn;
     protected _shInterval: number;
     protected _snackbarAnchor: ISnackbarAnchor;
-    protected _initialValues: DialogValues<Values>;
     protected _parent: Dialog<Values>;
     protected _handlers: DialogHandlers;
     private _inProcess;
@@ -39,8 +39,7 @@ declare class DialogBase<Values extends DialogValues<Record<string, any>>> exten
     private _accessFrom;
     private readonly _processingListeners;
     private readonly _abortedListeners;
-    constructor(props: BaseDialogProps & {
-        initialValues: DialogValues<Values>;
+    constructor(props: BaseDialogProps<Values> & {
         parent: Dialog<Values>;
     });
     private T;
@@ -63,9 +62,9 @@ declare class DialogBase<Values extends DialogValues<Record<string, any>>> exten
     set formikProps(value: FormikProps<any>);
     get formikValidate(): Promise<DialogFormikAdapter<any>>;
     set inlineFormikProps(inlineFormikProps: IFormikAdapter);
-    get values(): IFormikAdapter['values'];
-    setValue(key: string, value: ModelDialogValues<any>): void;
-    setValues(values: DialogValues<Values>, callbackFn?: () => void): void;
+    get values(): Values;
+    setValue<T>(key: string, value: Dialogify<T>): void;
+    setValues<T>(values: Dialogify<T>, callbackFn?: () => void): void;
     componentDidMount(): void;
     setInProcess: (process: boolean, message?: string, holder?: TInitialHolder) => this;
     isInProcess: () => IInProcess;

package/components/DialogBase.js

@@ -68,8 +68,6 @@ var _helpers_1 = require("../helpers/index.js");
 var _context_1 = require("../context/index.js");
 var DialogBase = /** @class */ (function (_super) {
     __extends(DialogBase, _super);
-    // constructor(props: Readonly<BaseDialogProps> = {} as Readonly<BaseDialogProps>) {
-    // constructor(props: BaseDialogProps) {
     function DialogBase(props) {
         var _a, _b;
         var _this = _super.call(this, props) || this;
@@ -127,20 +125,12 @@ var DialogBase = /** @class */ (function (_super) {
             if (!process) {
                 _this.snackbar.close("kInProcess");
             }
-            // if( typeof this._processingListener === "function" ){
-            //     this._processingListener(process);
-            //
-            // }
             for (var _i = 0, _l = _this._processingListeners; _i < _l.length; _i++) {
                 var listener = _l[_i];
                 if (typeof listener === "function") {
                     listener(process);
                 }
             }
-            // if( ._processingListener === "function" ){
-            // //     this._processingListener(process);
-            // //
-            // // }
             // @ts-ignore
             (_k = _this._footerRef.current) === null || _k === void 0 ? void 0 : _k.setProcessing(process);
             return _this;
@@ -197,15 +187,9 @@ var DialogBase = /** @class */ (function (_super) {
             return _this.props.dom;
         };
         _this.render = function () {
-            return (0, jsx_runtime_1.jsx)(_context_1.DialogContentContextProvider
-            // 1️⃣initialValues={this.props.initialValues}
-            , { 
-                // 1️⃣initialValues={this.props.initialValues}
-                dialogBase: _this, 
+            return (0, jsx_runtime_1.jsx)(_context_1.DialogContentContextProvider, { dialogBase: _this, 
                 // Component
-                // body={this.state.body(this)}
                 body: _this.state.body, 
-                // body={<this.Body body={this.state.body} /> as any}
                 // Refs Props
                 dialogRef: _this._dialogRef, headerRef: _this._headerRef, bodyRef: _this._dialogBodyRef, footerRef: _this._footerRef, backdropRef: _this._backdropRef, snackbarRef: _this._snackbarRef, prevDialogRect: _this.state.prevDialogRect, children: (0, jsx_runtime_1.jsx)(_components_1.DialogWithBackdropWrapper, {}) });
         };
@@ -356,9 +340,6 @@ var DialogBase = /** @class */ (function (_super) {
         configurable: true
     });
     Object.defineProperty(DialogBase.prototype, "inlineFormikProps", {
-        // ✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨
-        // ༄ inlineFormikProps 👉 Will Be initialized from Body or Content Component
-        // Instead of Dialog stateValues use FormikEngine
         set: function (inlineFormikProps) {
             this._inlineFormikProps = inlineFormikProps;
         },
@@ -366,35 +347,22 @@ var DialogBase = /** @class */ (function (_super) {
         configurable: true
     });
     Object.defineProperty(DialogBase.prototype, "values", {
-        // ✨✨✨✨✨✨✨✨✨✨✨
         get: function () {
-            // get values(): DialogValues<Values> {
             return this._inlineFormikProps.values;
-            // UseImperative
-            // return this._dialogWithBackDropRef?.current?.formikProps.values;
         },
         enumerable: false,
         configurable: true
     });
-    // ✨✨✨✨✨✨✨✨✨✨✨
     DialogBase.prototype.setValue = function (key, value) {
         var _a;
         (_a = this._inlineFormikProps) === null || _a === void 0 ? void 0 : _a.setFieldValue(key, value);
-        // UseImperative
-        // this._dialogWithBackDropRef?.current?.formikProps?.setFieldValue(key, value);
     };
-    // ✨✨✨✨✨✨✨✨✨✨✨
-    // public setValues(values: IFormikAdapter['values'], callbackFn?: () => void): void {
-    // 2 public setValues(values: DialogValues<Values>, callbackFn?: () => void): void {
     DialogBase.prototype.setValues = function (values, callbackFn) {
         this._inlineFormikProps.setValues(values);
-        // UseImperative
-        // this._dialogWithBackDropRef?.current?.formikProps?.setValues(values);
         if (typeof callbackFn === "function") {
             callbackFn();
         }
     };
-    // ✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨
     DialogBase.prototype.componentDidMount = function () {
         var _this = this;
         var _a, _b, _c;
@@ -423,8 +391,6 @@ var DialogBase = /** @class */ (function (_super) {
         setTimeout(function () {
             _this.props.root.unmount();
             _this.props.dom.remove();
-            // unmountComponentAtNode(this.props.dom);
-            // @deprecated
             if (typeof _this._onClose === "function") {
                 _this._onClose(_this);
             }
@@ -451,13 +417,10 @@ var DialogBase = /** @class */ (function (_super) {
         this.setState(function (prevState) { return (__assign(__assign({}, _this.state), { body: body })); });
     };
     DialogBase.prototype.processingListener = function (listener) {
-        // @ts-ignore
-        // this._processingListeners = listener;
         this._processingListeners.push(listener);
         return this;
     };
     DialogBase.prototype.onAbort = function (callbackFn) {
-        // @ts-ignore
         this._abortedListeners.push(callbackFn);
         return this;
     };

package/models/Dialog.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { DialogAction } from "./DialogAction";
-import { TInitialHolder, IDialogSize, TDialogStateListenerCallbackType, DialogOptionsType, IDialogApiDef, TDialogCallbackVoidFn, TDialogCallbackFn, DialogHandlers, ModelDialogValues } from "../types/index.js";
-declare class Dialog<Values extends ModelDialogValues<Record<string, any>>> {
+import { TInitialHolder, IDialogSize, TDialogStateListenerCallbackType, DialogOptionsType, IDialogApiDef, TDialogCallbackVoidFn, TDialogCallbackFn, DialogHandlers, Dialogify } from "../types/index.js";
+declare class Dialog<Values extends Record<string, any>> {
     private readonly _processingListeners;
     private readonly _abortedListeners;
     private _stateListener;
@@ -35,7 +35,7 @@ declare class Dialog<Values extends ModelDialogValues<Record<string, any>>> {
     stateListener(listener: TDialogStateListenerCallbackType): this;
     processingListener(listener: (inProcess: boolean) => void): this;
     onAbort(callbackFn: TDialogCallbackFn<void>): this;
-    initialValues(values: ModelDialogValues<Values>): this;
+    initialValues<T extends Record<string, any>>(values: Dialogify<T>): Dialog<T>;
     handlers(handlers: DialogHandlers): this;
     initialHolder(holder: TInitialHolder): this;
     keyboardListener(listener: (key: string, dialog: IDialogApiDef) => void): this;
@@ -43,6 +43,7 @@ declare class Dialog<Values extends ModelDialogValues<Record<string, any>>> {
     onClose(callback: TDialogCallbackVoidFn): this;
     private highestZ;
     private createDom;
+    get values(): Dialogify<Values>;
     show(callback?: TDialogCallbackVoidFn): void;
 }
 export default Dialog;

package/models/Dialog.js

@@ -128,9 +128,16 @@ var Dialog = /** @class */ (function () {
         this._abortedListeners.push(callbackFn);
         return this;
     };
+    // 👌Ok
+    // public initialValues<T>( values: Dialogify<T> ): this {
+    //     this._initialValues = values as Dialogify<Values>;;
+    //     return this;
+    // }
+    // 👌Ok Combined with Dialog Class
     Dialog.prototype.initialValues = function (values) {
-        this._initialValues = values;
-        return this;
+        var next = this;
+        next._initialValues = values;
+        return next;
     };
     Dialog.prototype.handlers = function (handlers) {
         this._handlers = handlers;
@@ -152,6 +159,13 @@ var Dialog = /** @class */ (function () {
         this._onCloseCallback = callback;
         return this;
     };
+    Object.defineProperty(Dialog.prototype, "values", {
+        get: function () {
+            return this._initialValues;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Dialog.prototype.show = function (callback) {
         var dom = this.createDom();
         var root = (0, client_1.createRoot)(dom);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-dialogger",
-  "version": "1.1.99",
+  "version": "1.1.100",
   "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

@@ -31,7 +31,8 @@ export interface DialogFormikAdapter<Values> extends Omit<FormikProps<any>, 'val
     validateForm(): Promise<any>;
     errors: any;
 }
-export interface BaseDialogProps {
+export interface BaseDialogProps<Values extends Record<string, any>> {
+    initialValues: Dialogify<Values>;
     initialOptions?: DialogOptionsType;
     body: TDialogCallbackFn;
     header?: TDialogCallbackFn;
@@ -39,7 +40,6 @@ export interface BaseDialogProps {
     didMountCallback?: TDialogCallbackVoidFn;
     dialogSize?: IDialogSize;
     stateListener: TDialogStateListenerCallbackType;
-    initialValues: DialogValues<Record<string, any>>;
     handlers: DialogHandlers;
     initialHolder: TInitialHolder;
     snackbarAnchor?: ISnackbarAnchor;
@@ -245,14 +245,17 @@ export type TInitialValues<T extends Record<string, any>> = T;
 export type TUserProps = {
     [K: string]: any;
 };
-export type NonFunction<T> = T extends (...args: any[]) => any ? never : T;
+export type NonFunction<T> = T extends Function ? never : T;
 export type DialogValue<T> = string | number | boolean | null | undefined | DialogValue<T>[] | {
     [key: string]: DialogValue<T>;
-} | NonFunction<T>;
+};
 export type ModelDialogValues<T> = {
-    [key: string]: DialogValue<T>;
+    [K in keyof T]: DialogValue<T>;
 };
-export type DialogValues<T> = ModelDialogValues<T>;
+export type DialogValues<T extends Record<string, any>> = ModelDialogValues<T>;
+export type Dialogify<T> = T extends Function ? never : T extends string | number | boolean | null | undefined ? T : T extends Array<infer U> ? Dialogify<U>[] : T extends object ? {
+    [K in keyof T]: Dialogify<T[K]>;
+} : never;
 export type DialogHandlerFn = (...args: any[]) => any;
 export type DialogHandlers = Record<string, DialogHandlerFn>;
 export interface BaseDialogDOMRect {