@arquimedes.co/eureka-forms 2.0.103 → 2.0.104

package/dist/@Types/GenericFormSteps.d.ts

@@ -2,6 +2,7 @@ import { Condition } from './Condition';
 export interface GBaseStep {
     id: string;
     idSection: string;
+    idOriginal: string;
     type: string;
     editable?: boolean;
     partial?: boolean;

package/dist/App/App.js

@@ -29,9 +29,10 @@ import FormComponent from '../Form/Form';
 import { Provider } from 'react-redux';
 import { store } from '../Utils/store';
 import { useSetupApp } from './AppHooks';
-import { StoreContext, useAppSelector } from '../hooks';
+import { useAppSelector } from '../hooks';
 import CustomContext from '../Contexts/CustomContext';
 import { nanoid } from '@reduxjs/toolkit';
+import { StoreContext } from '../Utils/StoreContext';
 export var IdFormContext = createContext('');
 function AppComponent(_a) {
     var formData = _a.formData, valuesData = _a.valuesData, props = __rest(_a, ["formData", "valuesData"]);

package/dist/App/AppFunctions.d.ts

@@ -6,8 +6,8 @@ import { MapperElement } from '../@Types/MapperElement';
 import { MapperValue } from '../FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep';
 import { CountryCode } from 'libphonenumber-js/max';
 export declare const calcValuesStore: (orgInfo: {
-    idOrganization: string;
-    countryCode: CountryCode;
+    idOrganization?: string;
+    countryCode?: CountryCode;
 }, form: Readonly<Form>, originalValues?: Record<string, any>, postview?: boolean, customSteps?: Record<string, CustomStep>) => Promise<ValuesStore>;
 export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<string, CustomStep>, path?: string) => {
     element: MapperElement<Type>;
@@ -17,7 +17,7 @@ export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<str
     steps: Record<string, FormStep>;
 };
 export declare const mapOriginalValue: (orgInfo: {
-    idOrganization: string;
-    countryCode: CountryCode;
+    idOrganization?: string;
+    countryCode?: CountryCode;
 }, step: FormStep, value: any, values: ValuesStore, form?: Readonly<Form>, path?: string) => Promise<any>;
 export declare const calcInitialSections: (form: Form) => Pick<SiteState, 'previousSections' | 'idCurrentSection' | 'nextSections'>;

package/dist/App/AppHooks.js

@@ -157,6 +157,7 @@ export var useSetupApp = function (isEmbedded, _a) {
                                     var idStep = _c[_b];
                                     iterateNestedSteps(idStep, form.steps, function (step) {
                                         step.idSection = section.id;
+                                        step.idOriginal = step.id;
                                     });
                                 }
                             };

package/dist/Form/Form.d.ts

@@ -9,6 +9,8 @@ import { FormStep } from '../@Types/FormStep';
 import { CBRFormStep } from '../@Types/CBRFormStep';
 export declare const getLocale: () => any;
 export interface StepDependency {
+    /** The id of the step before it was mapped */
+    idOriginal: string;
     dependents: (FormStep | CBRFormStep)[];
     value: any | undefined;
     type: FormStepTypes | CBRFormStepTypes | 'ORIGINAL';

package/dist/Form/FormFunctions.js

@@ -215,6 +215,7 @@ function calcStepDependency(idStep, steps, values, customSteps) {
         if (!originalValue_1)
             console.error('Missing Step Dependency:', idStep);
         return {
+            idOriginal: idStep,
             type: originalValue_1 ? 'ORIGINAL' : 'MISSING',
             value: originalValue_1 !== null && originalValue_1 !== void 0 ? originalValue_1 : null,
             dependents: [],
@@ -223,6 +224,7 @@ function calcStepDependency(idStep, steps, values, customSteps) {
     var originalValue = (_b = (_a = values.sections[depStep.idSection]) === null || _a === void 0 ? void 0 : _a[depStep.id]) !== null && _b !== void 0 ? _b : values.global[depStep.id];
     return {
         type: depStep.type,
+        idOriginal: depStep.idOriginal,
         value: calcStepDependencyValue(depStep, originalValue, customSteps),
         dependents: [],
     };

package/dist/FormSteps/TitleStep/MaterialTitleStep/MaterialTitleStep.js

@@ -14,13 +14,13 @@ import { calcStepWidth } from '../../StepFunctions';
 import styles from './MaterialTitleStep.module.css';
 import { useAppSelector } from '../../../hooks';
 import FormContext from '../../../Contexts/FormContext';
-import { useContext } from 'react';
-import { useFormStep } from '../../StepHooks';
-import { convertFromRaw, EditorState } from 'draft-js';
+import { useContext, useMemo } from 'react';
+import { selectDependencies, useFormStep } from '../../StepHooks';
+import { convertFromRaw } from 'draft-js';
 import { stringToDraft } from '../../../Utils/DraftFunctions';
-import { Editor } from 'react-draft-wysiwyg';
+import SmartDraftRenderer from '../../../Shared/SmartDraftRenderer';
 function TitleStep(_a) {
-    var _b, _c, _d;
+    var _b;
     var step = _a.step;
     var value = useFormStep(step, {
         defaultValue: undefined,
@@ -29,24 +29,38 @@ function TitleStep(_a) {
     var form = useContext(FormContext);
     var widthStats = useAppSelector(function (state) { return state.widthStats; });
     var size = (_b = step.size) !== null && _b !== void 0 ? _b : form.size.blockNum;
-    var title = convertFromRaw((value === null || value === void 0 ? void 0 : value.title)
-        ? stringToDraft(value.title)
-        : (_c = step.title) !== null && _c !== void 0 ? _c : stringToDraft(''));
-    var description = convertFromRaw((value === null || value === void 0 ? void 0 : value.description)
-        ? stringToDraft(value.description)
-        : (_d = step.description) !== null && _d !== void 0 ? _d : stringToDraft(''));
+    var title = useMemo(function () { return calcBaseDraft(value === null || value === void 0 ? void 0 : value.title, step.title); }, [value === null || value === void 0 ? void 0 : value.title, step.title]);
+    var hasTitle = useMemo(function () { return convertFromRaw(title).getPlainText().length > 0; }, [title]);
+    var description = useMemo(function () { return calcBaseDraft(value === null || value === void 0 ? void 0 : value.description, step.description); }, [value === null || value === void 0 ? void 0 : value.description, step.description]);
+    var hasDescription = useMemo(function () { return convertFromRaw(description).getPlainText().length > 0; }, [description]);
+    var dependencies = useAppSelector(function (state) {
+        return selectDependencies(state, step.dependencies);
+    });
+    var values = useMemo(function () {
+        var values = {};
+        for (var _i = 0, _a = Object.values(dependencies); _i < _a.length; _i++) {
+            var _b = _a[_i], idOriginal = _b.idOriginal, value_1 = _b.value;
+            values[idOriginal] = value_1;
+        }
+        return values;
+    }, [dependencies]);
     return (_jsxs("div", __assign({ className: styles.container, style: {
             color: formStyle.textColor,
             width: widthStats.currentBreakPoint <= size
                 ? '100%'
                 : calcStepWidth(size, form.size),
-        } }, { children: [title.getPlainText().length > 0 && (_jsx("div", __assign({ className: styles.titleLbl, style: {
+        } }, { children: [hasTitle && (_jsx("div", __assign({ className: styles.titleLbl, style: {
                     textAlign: widthStats.isMobile &&
                         widthStats.currentBreakPoint <= size
                         ? 'center'
                         : 'start',
-                } }, { children: _jsx(Editor, { editorClassName: 'Erk-Forms-Draft', editorState: EditorState.createWithContent(title), readOnly: true, toolbarHidden: true }) }))), description.getPlainText().length > 0 && (_jsx("div", __assign({ className: styles.descriptionPar, style: {
+                } }, { children: _jsx(SmartDraftRenderer, { draft: title, dependencies: values }) }))), hasDescription && (_jsx("div", __assign({ className: styles.descriptionPar, style: {
                     margin: title ? '10px 0px' : '0px 0px 5px 0px',
-                } }, { children: _jsx(Editor, { editorClassName: 'Erk-Forms-Draft', editorState: EditorState.createWithContent(description), readOnly: true, toolbarHidden: true }) })))] })));
+                } }, { children: _jsx(SmartDraftRenderer, { draft: description, dependencies: values }) })))] })));
 }
 export default TitleStep;
+function calcBaseDraft(value, draft) {
+    return value
+        ? stringToDraft(value)
+        : draft !== null && draft !== void 0 ? draft : stringToDraft('');
+}

package/dist/Services/DraftService.d.ts

@@ -0,0 +1,21 @@
+import { EurekaDraft } from '../@Types/Draft/Draft';
+export declare const DraftApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<{
+    url: string;
+    timeout?: number | undefined;
+    method?: string | undefined;
+    body?: any;
+    params?: any;
+    headers?: Record<string, any> | undefined;
+}, unknown, unknown, {}, {}>, {
+    mapDraft: import("@reduxjs/toolkit/query").QueryDefinition<{
+        idForm: string;
+        dependencies: Record<string, any>;
+    }, import("@reduxjs/toolkit/query").BaseQueryFn<{
+        url: string;
+        timeout?: number | undefined;
+        method?: string | undefined;
+        body?: any;
+        params?: any;
+        headers?: Record<string, any> | undefined;
+    }, unknown, unknown, {}, {}>, never, EurekaDraft | undefined, "api">;
+}, "api", never, typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/dist/query/react").reactHooksModuleName>;

package/dist/Services/DraftService.js

@@ -0,0 +1,71 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { RootApi } from '../Utils/_api';
+import axiosInstance from '../Utils/AxiosAPI';
+import widgetInstance from '../Utils/AxiosWidget';
+export var DraftApi = RootApi.injectEndpoints({
+    endpoints: function (build) { return ({
+        mapDraft: build.query({
+            queryFn: function (_a, _b) {
+                var idForm = _a.idForm, dependencies = _a.dependencies;
+                var getState = _b.getState;
+                return __awaiter(void 0, void 0, void 0, function () {
+                    var idOrganization, response;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
+                            case 0:
+                                idOrganization = getState().forms[idForm]
+                                    .global.idOrganization;
+                                if (idOrganization != 'AAA')
+                                    return [2 /*return*/, { data: undefined }];
+                                if (!idOrganization) return [3 /*break*/, 2];
+                                return [4 /*yield*/, widgetInstance.post("/form/draft?idOrganization=".concat(idOrganization), dependencies)];
+                            case 1:
+                                response = _c.sent();
+                                return [3 /*break*/, 4];
+                            case 2: return [4 /*yield*/, axiosInstance.post('/form/draft', dependencies)];
+                            case 3:
+                                response = _c.sent();
+                                _c.label = 4;
+                            case 4: return [2 /*return*/, { data: response.data }];
+                        }
+                    });
+                });
+            },
+        }),
+    }); },
+});

package/dist/Shared/SmartDraftRenderer.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { EurekaDraft } from '../@Types/Draft/Draft';
+interface SmartDraftRendererProps {
+    draft: EurekaDraft;
+    dependencies: Record<string, any>;
+}
+declare function SmartDraftRenderer({ draft, dependencies, }: SmartDraftRendererProps): JSX.Element;
+export default SmartDraftRenderer;

package/dist/Shared/SmartDraftRenderer.js

@@ -0,0 +1,17 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext, useMemo } from 'react';
+import { IdFormContext } from '../App/App';
+import { DraftApi } from '../Services/DraftService';
+import { convertFromRaw, EditorState } from 'draft-js';
+import { Editor } from 'react-draft-wysiwyg';
+function SmartDraftRenderer(_a) {
+    var draft = _a.draft, dependencies = _a.dependencies;
+    var idForm = useContext(IdFormContext);
+    var mapped = DraftApi.useMapDraftQuery({
+        idForm: idForm,
+        dependencies: dependencies,
+    }).data;
+    var editorState = useMemo(function () { return EditorState.createWithContent(convertFromRaw(mapped !== null && mapped !== void 0 ? mapped : draft)); }, [mapped, draft]);
+    return (_jsx(Editor, { editorClassName: 'Erk-Forms-Draft', editorState: editorState, readOnly: true, toolbarHidden: true }));
+}
+export default SmartDraftRenderer;

package/dist/Utils/AxiosAPI.d.ts

@@ -1,2 +1,13 @@
+import { BaseQueryFn } from '@reduxjs/toolkit/query';
+import { AxiosRequestConfig } from 'axios';
+declare const headers: {};
 declare const axiosInstance: import("axios").AxiosInstance;
 export default axiosInstance;
+export declare const axiosBaseQuery: () => BaseQueryFn<{
+    url: string;
+    timeout?: AxiosRequestConfig['timeout'];
+    method?: AxiosRequestConfig['method'];
+    body?: AxiosRequestConfig['data'];
+    params?: AxiosRequestConfig['params'];
+    headers?: Record<string, any>;
+}, unknown, unknown>;

package/dist/Utils/AxiosAPI.js

@@ -1,3 +1,39 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import axios from 'axios';
 var headers = {};
 var axiosInstance = axios.create({
@@ -6,3 +42,39 @@ var axiosInstance = axios.create({
     headers: headers,
 });
 export default axiosInstance;
+export var axiosBaseQuery = function () {
+    return function (_a) {
+        var url = _a.url, method = _a.method, body = _a.body, params = _a.params, timeout = _a.timeout, headers = _a.headers;
+        return __awaiter(void 0, void 0, void 0, function () {
+            var result, axiosError_1, err;
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _d.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, axiosInstance({
+                                url: url,
+                                method: method,
+                                data: body,
+                                params: params,
+                                headers: headers,
+                                timeout: timeout,
+                            })];
+                    case 1:
+                        result = _d.sent();
+                        return [2 /*return*/, { data: result.data }];
+                    case 2:
+                        axiosError_1 = _d.sent();
+                        err = axiosError_1;
+                        return [2 /*return*/, {
+                                error: {
+                                    status: (_b = err.response) === null || _b === void 0 ? void 0 : _b.status,
+                                    data: ((_c = err.response) === null || _c === void 0 ? void 0 : _c.data) || err.message,
+                                },
+                            }];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+};

package/dist/Utils/StoreContext.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const StoreContext: React.Context<any>;

package/dist/Utils/StoreContext.js

@@ -0,0 +1,2 @@
+import React from 'react';
+export var StoreContext = React.createContext({});

package/dist/Utils/TestUtils.d.ts

@@ -60,7 +60,17 @@ export declare function renderWithProviders(ui: React.ReactElement, { store, ...
     queryAllByTestId: (id: import("@testing-library/react").Matcher, options?: import("@testing-library/react").MatcherOptions | undefined) => HTMLElement[];
     findByTestId: (id: import("@testing-library/react").Matcher, options?: import("@testing-library/react").MatcherOptions | undefined, waitForElementOptions?: import("@testing-library/react").waitForOptions | undefined) => Promise<HTMLElement>;
     findAllByTestId: (id: import("@testing-library/react").Matcher, options?: import("@testing-library/react").MatcherOptions | undefined, waitForElementOptions?: import("@testing-library/react").waitForOptions | undefined) => Promise<HTMLElement[]>;
-    store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<import("./store").EurekaFormsState, import("redux").AnyAction, [import("@reduxjs/toolkit").ThunkMiddleware<import("./store").EurekaFormsState, import("redux").AnyAction, undefined>]>;
+    store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<import("redux").EmptyObject & {
+        forms: {
+            [x: string]: import("./store").RootState;
+        };
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, never, "api">;
+    }, import("redux").AnyAction, import("@reduxjs/toolkit").MiddlewareArray<[import("@reduxjs/toolkit").ThunkMiddleware<import("redux").CombinedState<{
+        forms: {
+            [x: string]: import("./store").RootState;
+        };
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, never, "api">;
+    }>, import("redux").AnyAction, undefined>, import("redux").Middleware<{}, import("@reduxjs/toolkit/query").RootState<{}, string, "api">, import("@reduxjs/toolkit").ThunkDispatch<any, any, import("redux").AnyAction>>]>>;
 };
 interface ExtendedRenderHookOptions<TProps> extends Omit<RenderHookOptions<TProps>, 'wrapper'> {
     store?: AppStore;
@@ -72,6 +82,16 @@ export declare function renderHookWithProviders<TProps, TResult>(callback: (prop
     waitFor: import("@testing-library/react-hooks").WaitFor;
     waitForValueToChange: import("@testing-library/react-hooks").WaitForValueToChange;
     waitForNextUpdate: import("@testing-library/react-hooks").WaitForNextUpdate;
-    store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<import("./store").EurekaFormsState, import("redux").AnyAction, [import("@reduxjs/toolkit").ThunkMiddleware<import("./store").EurekaFormsState, import("redux").AnyAction, undefined>]>;
+    store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<import("redux").EmptyObject & {
+        forms: {
+            [x: string]: import("./store").RootState;
+        };
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, never, "api">;
+    }, import("redux").AnyAction, import("@reduxjs/toolkit").MiddlewareArray<[import("@reduxjs/toolkit").ThunkMiddleware<import("redux").CombinedState<{
+        forms: {
+            [x: string]: import("./store").RootState;
+        };
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, never, "api">;
+    }>, import("redux").AnyAction, undefined>, import("redux").Middleware<{}, import("@reduxjs/toolkit/query").RootState<{}, string, "api">, import("@reduxjs/toolkit").ThunkDispatch<any, any, import("redux").AnyAction>>]>>;
 };
 export {};

package/dist/Utils/TestUtils.js

@@ -23,13 +23,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { render } from '@testing-library/react';
-import { configureStore, nanoid } from '@reduxjs/toolkit';
+import { combineReducers, configureStore, nanoid } from '@reduxjs/toolkit';
 import { Provider } from 'react-redux';
 // As a basic setup, import your same slice reducers
 import { EurekaFormsReducer } from './store';
 import { renderHook } from '@testing-library/react-hooks';
 import { IdFormContext } from '../App/App';
-import { StoreContext } from '../hooks';
+import { RootApi } from './_api';
+import { StoreContext } from './StoreContext';
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export function renderWithProviders(ui, _a) {
     if (_a === void 0) { _a = {}; }
@@ -38,7 +39,10 @@ export function renderWithProviders(ui, _a) {
     _b = _a.store, 
     // Automatically create a store instance if no store was passed in
     store = _b === void 0 ? configureStore({
-        reducer: EurekaFormsReducer,
+        reducer: combineReducers({
+            forms: EurekaFormsReducer,
+            api: RootApi.reducer,
+        }),
     }) : _b, renderOptions = __rest(_a, ["store"]);
     // eslint-disable-next-line @typescript-eslint/ban-types
     function Wrapper(_a) {
@@ -52,7 +56,10 @@ export function renderWithProviders(ui, _a) {
 export function renderHookWithProviders(callback, _a) {
     if (_a === void 0) { _a = {}; }
     var _b = _a.store, store = _b === void 0 ? configureStore({
-        reducer: EurekaFormsReducer,
+        reducer: combineReducers({
+            forms: EurekaFormsReducer,
+            api: RootApi.reducer,
+        }),
     }) : _b, renderHookOptions = __rest(_a, ["store"]);
     // eslint-disable-next-line @typescript-eslint/ban-types
     function Wrapper(_a) {

package/dist/Utils/_api.d.ts

@@ -0,0 +1,8 @@
+export declare const RootApi: import("@reduxjs/toolkit/query/react").Api<import("@reduxjs/toolkit/query/react").BaseQueryFn<{
+    url: string;
+    timeout?: number | undefined;
+    method?: string | undefined;
+    body?: any;
+    params?: any;
+    headers?: Record<string, any> | undefined;
+}, unknown, unknown, {}, {}>, {}, "api", never, typeof import("@reduxjs/toolkit/query/react").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

package/dist/Utils/_api.js

@@ -0,0 +1,13 @@
+import { buildCreateApi, coreModule, reactHooksModule, } from '@reduxjs/toolkit/query/react';
+import { axiosBaseQuery } from './AxiosAPI';
+import { createDispatchHook, createSelectorHook, createStoreHook, } from 'react-redux';
+import { StoreContext } from './StoreContext';
+var customCreateApi = buildCreateApi(coreModule(), reactHooksModule({
+    useDispatch: createDispatchHook(StoreContext),
+    useSelector: createSelectorHook(StoreContext),
+    useStore: createStoreHook(StoreContext),
+}));
+export var RootApi = customCreateApi({
+    baseQuery: axiosBaseQuery(),
+    endpoints: function () { return ({}); },
+});

package/dist/Utils/store.d.ts

@@ -8,11 +8,18 @@ export interface RootState {
     widthStats: WidthStats;
 }
 export declare const defaultRootState: RootState;
-export type EurekaFormsState = Record<string, RootState>;
+type EurekaFormsState = Record<string, RootState>;
 export declare function EurekaFormsReducer(state: EurekaFormsState | undefined, action: AnyAction): EurekaFormsState;
-export declare const store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<EurekaFormsState, AnyAction, [import("@reduxjs/toolkit").ThunkMiddleware<EurekaFormsState, AnyAction, undefined>]>;
+export declare const store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<import("redux").EmptyObject & {
+    forms: EurekaFormsState;
+    api: import("@reduxjs/toolkit/query").CombinedState<{}, never, "api">;
+}, AnyAction, import("@reduxjs/toolkit").MiddlewareArray<[import("@reduxjs/toolkit").ThunkMiddleware<import("redux").CombinedState<{
+    forms: EurekaFormsState;
+    api: import("@reduxjs/toolkit/query").CombinedState<{}, never, "api">;
+}>, AnyAction, undefined>, import("redux").Middleware<{}, import("@reduxjs/toolkit/query").RootState<{}, string, "api">, import("@reduxjs/toolkit").ThunkDispatch<any, any, AnyAction>>]>>;
 export type AppDispatch = typeof store.dispatch;
 export type AppStore = typeof store;
+export type AppState = ReturnType<typeof store.getState>;
 export declare const getAppState: import("@reduxjs/toolkit").AsyncThunk<RootState, {
     idForm: string;
 }, {
@@ -25,3 +32,4 @@ export declare const getAppState: import("@reduxjs/toolkit").AsyncThunk<RootStat
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
+export {};

package/dist/Utils/store.js

@@ -45,15 +45,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var _a;
 import { combineReducers, configureStore, createAsyncThunk, } from '@reduxjs/toolkit';
 import GlobalSlice from '../States/GlobalSlice';
 import SiteSlice from '../States/SiteSlice';
 import WidthStatsSlice from '../States/WidthStatsSlice';
+import { RootApi } from './_api';
 export var defaultRootState = {
     global: GlobalSlice.getInitialState(),
     site: SiteSlice.getInitialState(),
     widthStats: WidthStatsSlice.getInitialState(),
 };
+var reducer = combineReducers((_a = {
+        forms: EurekaFormsReducer
+    },
+    _a[RootApi.reducerPath] = RootApi.reducer,
+    _a));
 var FormReducer = combineReducers({
     global: GlobalSlice.reducer,
     site: SiteSlice.reducer,
@@ -72,13 +79,16 @@ export function EurekaFormsReducer(state, action) {
     return __assign(__assign({}, state), (_b = {}, _b[idForm] = FormReducer(state[idForm], action), _b));
 }
 export var store = configureStore({
-    reducer: EurekaFormsReducer,
+    reducer: reducer,
+    middleware: function (getDefaultMiddleware) {
+        return getDefaultMiddleware().concat(RootApi.middleware);
+    },
 });
 export var getAppState = createAsyncThunk('get/state', function (_a, thunkAPI) {
     var idForm = _a.idForm;
     return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_b) {
-            return [2 /*return*/, thunkAPI.getState()[idForm]];
+            return [2 /*return*/, thunkAPI.getState().forms[idForm]];
         });
     });
 });

package/dist/hooks.d.ts

@@ -1,7 +1,5 @@
 import type { TypedUseSelectorHook } from 'react-redux';
 import { type RootState, type AppDispatch } from './Utils/store';
-import React from 'react';
-export declare const StoreContext: React.Context<any>;
 export declare const useAppDispatch: () => AppDispatch;
 export declare const useAppSelector: TypedUseSelectorHook<RootState>;
 export declare const selectBreakPoint: (state: RootState) => number;

package/dist/hooks.js

@@ -2,8 +2,7 @@ import { createDispatchHook, createSelectorHook } from 'react-redux';
 import { defaultRootState, } from './Utils/store';
 import { useContext } from 'react';
 import { IdFormContext } from './App/App';
-import React from 'react';
-export var StoreContext = React.createContext({});
+import { StoreContext } from './Utils/StoreContext';
 var useSelector = createSelectorHook(StoreContext);
 var useDispatch = createDispatchHook(StoreContext);
 // Use throughout your app instead of plain `useDispatch` and `useSelector`
@@ -18,7 +17,7 @@ export var useAppDispatch = function () {
 };
 export var useAppSelector = function (selector, options) {
     var idForm = useContext(IdFormContext);
-    return useSelector(function (state) { var _a; return selector((_a = state[idForm]) !== null && _a !== void 0 ? _a : defaultRootState); }, options);
+    return useSelector(function (state) { var _a; return selector((_a = state.forms[idForm]) !== null && _a !== void 0 ? _a : defaultRootState); }, options);
 };
 export var selectBreakPoint = function (state) {
     return state.widthStats.currentBreakPoint;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version": "2.0.103",
+    "version": "2.0.104",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",