fastapi-rtk 0.2.7 → 0.2.9

package/dist/core/cjs/Wrappers/ApiProvider/hooks/useProvideApi.cjs

@@ -85,9 +85,9 @@ function useProvideApi({
     }),
     [streamingMode]
   );
-  const [error, setError] = React.useState(null);
+  const [error, setError] = React.useState();
   const memoizedError = React.useMemo(() => error, [error]);
-  const resetError = React.useCallback(() => setError(null), []);
+  const resetError = React.useCallback(() => setError(void 0), []);
   const {
     data: info,
     isFetching: infoLoading,
@@ -150,8 +150,8 @@ function useProvideApi({
   const getEntry = React.useCallback(
     async (id) => {
       try {
-        const response = await getItem.getItem(pathRef.current, convertId.convertId(id));
         resetError();
+        const response = await getItem.getItem(pathRef.current, convertId.convertId(id));
         return response;
       } catch (error2) {
         setError({ message: `Couldn't fetch item with id ${id}`, originalError: error2 });
@@ -166,9 +166,9 @@ function useProvideApi({
     async (item) => {
       var _a;
       try {
+        resetError();
         const func = ((_a = infoRef.current) == null ? void 0 : _a.add_type) === "form" ? formCreateItem.formCreateItem : createItem.createItem;
         const response = await func(pathRef.current, item);
-        resetError();
         return response;
       } catch (error2) {
         setError({ message: `Couldn't add item`, originalError: error2 });
@@ -183,9 +183,9 @@ function useProvideApi({
     async (id, item) => {
       var _a;
       try {
+        resetError();
         const func = ((_a = infoRef.current) == null ? void 0 : _a.edit_type) === "form" ? formUpdateItem.formUpdateItem : updateItem.updateItem;
         const response = await func(pathRef.current, convertId.convertId(id), item);
-        resetError();
         return response;
       } catch (error2) {
         setError({ message: `Couldn't update item with id ${id}`, originalError: error2 });
@@ -199,8 +199,8 @@ function useProvideApi({
   const deleteEntry = React.useCallback(
     async (id) => {
       try {
-        const response = await deleteItem.deleteItem(pathRef.current, convertId.convertId(id));
         resetError();
+        const response = await deleteItem.deleteItem(pathRef.current, convertId.convertId(id));
         return response;
       } catch (error2) {
         setError({ message: `Couldn't delete item with id ${id}`, originalError: error2 });
@@ -214,8 +214,8 @@ function useProvideApi({
   const download = React.useCallback(
     async (label, { export_mode, delimiter, quotechar } = {}) => {
       try {
-        await downloadItems.downloadItems(pathRef.current, queryParamsRef.current, { label, export_mode, delimiter, quotechar });
         resetError();
+        await downloadItems.downloadItems(pathRef.current, queryParamsRef.current, { label, export_mode, delimiter, quotechar });
       } catch (error2) {
         setError({ message: `Couldn't download`, originalError: error2 });
         if (throwOnError) {
@@ -228,8 +228,8 @@ function useProvideApi({
   const upload = React.useCallback(
     async (file, { delimiter, quotechar } = {}) => {
       try {
-        const response = await uploadItems.uploadItems(pathRef.current, file, { delimiter, quotechar });
         resetError();
+        const response = await uploadItems.uploadItems(pathRef.current, file, { delimiter, quotechar });
         return response;
       } catch (error2) {
         setError({ message: `Couldn't upload`, originalError: error2 });

package/dist/core/cjs/Wrappers/ApiProvider/hooks/useProvideBulk.cjs

@@ -5,26 +5,23 @@ const postBulkAction = require("../utils/bulkActions/postBulkAction.cjs");
 const useProvideBulk = ({ path }) => {
   const [selectedIds, setSelectedIds] = React.useState([]);
   const [error, setError] = React.useState();
+  const resetError = React.useCallback(() => setError(void 0), []);
   const dispatchBulkActions = React.useCallback(
     async (handler, data) => {
       try {
+        resetError();
         if (data === void 0) {
           data = selectedIds;
         }
         const response = await postBulkAction.postBulk(path, handler, data);
-        setError(void 0);
         return response;
       } catch (error2) {
         setError({ message: `Couldn't perform bulk action`, originalError: error2 });
       }
     },
-    [path, selectedIds]
+    [path, resetError, selectedIds]
   );
   const bulkActions = React.useMemo(() => ({ selectedIds, setSelectedIds }), [selectedIds, setSelectedIds]);
-  return {
-    bulkActions,
-    dispatchBulkActions,
-    error
-  };
+  return { bulkActions, dispatchBulkActions, error, resetError };
 };
 exports.useProvideBulk = useProvideBulk;

package/dist/core/cjs/Wrappers/Provider/Contexts/AuthContext.cjs

@@ -1,21 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
-const AuthContext = React.createContext({
-  /**
-   * @type {{email: string, first_name: string, id: number, is_active: boolean, last_name: string, permissions: string[], roles: string[], username: string} | null}
-   */
-  user: null,
-  loading: false,
-  /**
-   * @type {{message: string, originalError: Error} | null}
-   */
-  error: null,
-  signin: async (username, password) => null,
-  signout: async () => null,
-  update: async (data) => null,
-  resetPassword: async (password) => null,
-  oauth_signin: (provider, popup) => null,
-  refetch: async () => null
-});
-exports.AuthContext = AuthContext;
+const utils = require("fastapi-rtk/utils");
+const [AuthContextProvider, useAuthProvider] = utils.createSafeContext("useAuth must be used within a Provider");
+exports.AuthContextProvider = AuthContextProvider;
+exports.useAuthProvider = useAuthProvider;

package/dist/core/cjs/Wrappers/Provider/Contexts/InfoContext.cjs

@@ -1,16 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
-const InfoContext = React.createContext({
-  baseUrl: "",
-  /**
-   * @type {{icon: string, level: string, name: string, path: string, permission_name: string, type: string}[] | null}
-   */
-  info: null,
-  loading: false,
-  /**
-   * @type {{message: string, originalError: Error} | null}
-   */
-  error: null
-});
-exports.InfoContext = InfoContext;
+const utils = require("fastapi-rtk/utils");
+const [InfoContextProvider, useInfoProvider] = utils.createSafeContext("useInfo must be used within a Provider");
+exports.InfoContextProvider = InfoContextProvider;
+exports.useInfoProvider = useInfoProvider;

package/dist/core/cjs/Wrappers/Provider/Provider.cjs

@@ -30,7 +30,7 @@ function InnerProvider(props) {
   const authProxy = zustand.useProxy(auth);
   const info = useInfo(baseUrl, auth, props.fab);
   const infoProxy = zustand.useProxy(info);
-  return /* @__PURE__ */ jsxRuntime.jsx(AuthContext.AuthContext.Provider, { value: authProxy, children: /* @__PURE__ */ jsxRuntime.jsx(InfoContext.InfoContext.Provider, { value: infoProxy, children }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(AuthContext.AuthContextProvider, { value: authProxy, children: /* @__PURE__ */ jsxRuntime.jsx(InfoContext.InfoContextProvider, { value: infoProxy, children }) });
 }
 const Provider = (props) => {
   const [queryClient$1] = React.useState(() => new queryClient.QueryClient(props.queryClientProps));

package/dist/core/cjs/Wrappers/Provider/hooks/useProvideAuth.cjs

@@ -13,31 +13,32 @@ function useProvideAuth(baseURL, authQueryProps) {
     retry: false,
     ...authQueryProps
   });
-  const [error, setError] = React.useState(null);
+  const [error, setError] = React.useState();
+  const resetError = React.useCallback(() => setError(void 0), []);
   const signin = React.useCallback(
     ({ username, password }) => {
-      setError(null);
+      resetError();
       authFetch.authSignin(baseURL, { username, password }).then(() => queryClient.invalidateQueries({ queryKey: ["user"] })).catch((err) => setError(err));
     },
-    [baseURL, queryClient]
+    [baseURL, queryClient, resetError]
   );
   const signout = React.useCallback(() => {
-    setError(null);
+    resetError();
     authFetch.authSignout(baseURL).then(() => queryClient.resetQueries({ queryKey: ["user"] })).then(() => queryClient.resetQueries({ queryKey: ["info"] })).catch((err) => setError(err));
-  }, [baseURL, queryClient]);
+  }, [baseURL, queryClient, resetError]);
   const update = React.useCallback(
     (data) => {
-      setError(null);
+      resetError();
       userCRUD.updateUser(baseURL, data).then(() => queryClient.invalidateQueries({ queryKey: ["user"] })).catch((err) => setError(err));
     },
-    [baseURL, queryClient]
+    [baseURL, queryClient, resetError]
   );
   const resetPassword = React.useCallback(
     (password) => {
-      setError(null);
+      resetError();
       authFetch.authResetPassword(baseURL, password, query.data).catch((err) => setError(err));
     },
-    [baseURL, query.data]
+    [baseURL, query.data, resetError]
   );
   const oauth_signin = React.useCallback(
     (provider, popup) => authFetch.authOAuthSignin(baseURL, provider, popup, () => queryClient.invalidateQueries({ queryKey: ["user"] })),
@@ -52,7 +53,8 @@ function useProvideAuth(baseURL, authQueryProps) {
     update,
     resetPassword,
     oauth_signin,
-    refetch: query.refetch
+    refetch: query.refetch,
+    resetError
   };
 }
 exports.useProvideAuth = useProvideAuth;

package/dist/core/cjs/fab-react-toolkit-patch/api/hooks/useProvideApi.cjs

@@ -83,9 +83,9 @@ function useFabProvideApi({
     }),
     [streamingMode]
   );
-  const [error, setError] = React.useState(null);
+  const [error, setError] = React.useState();
   const memoizedError = React.useMemo(() => error, [error]);
-  const resetError = React.useCallback(() => setError(null), []);
+  const resetError = React.useCallback(() => setError(void 0), []);
   const {
     data: info,
     isFetching: infoLoading,
@@ -144,8 +144,8 @@ function useFabProvideApi({
   const getEntry = React.useCallback(
     async (id) => {
       try {
-        const response = await getItem.getItem(pathRef.current, convertId.convertId(id));
         resetError();
+        const response = await getItem.getItem(pathRef.current, convertId.convertId(id));
         return response;
       } catch (error2) {
         setError({ message: `Couldn't fetch item with id ${id}`, originalError: error2 });
@@ -159,8 +159,8 @@ function useFabProvideApi({
   const addEntry = React.useCallback(
     async (item) => {
       try {
-        const response = await createItem.createItem(pathRef.current, item);
         resetError();
+        const response = await createItem.createItem(pathRef.current, item);
         return response;
       } catch (error2) {
         setError({ message: `Couldn't add item`, originalError: error2 });
@@ -174,8 +174,8 @@ function useFabProvideApi({
   const updateEntry = React.useCallback(
     async (id, item) => {
       try {
-        const response = await updateItem.updateItem(pathRef.current, convertId.convertId(id), item);
         resetError();
+        const response = await updateItem.updateItem(pathRef.current, convertId.convertId(id), item);
         return response;
       } catch (error2) {
         setError({ message: `Couldn't update item with id ${id}`, originalError: error2 });
@@ -189,8 +189,8 @@ function useFabProvideApi({
   const deleteEntry = React.useCallback(
     async (id) => {
       try {
-        const response = await deleteItem.deleteItem(pathRef.current, convertId.convertId(id));
         resetError();
+        const response = await deleteItem.deleteItem(pathRef.current, convertId.convertId(id));
         return response;
       } catch (error2) {
         setError({ message: `Couldn't delete item with id ${id}`, originalError: error2 });
@@ -204,8 +204,8 @@ function useFabProvideApi({
   const download = React.useCallback(
     async (label, { export_mode, delimiter, quotechar } = {}) => {
       try {
-        await downloadItems.downloadItems(pathRef.current, queryParamsRef.current, { label, export_mode, delimiter, quotechar });
         resetError();
+        await downloadItems.downloadItems(pathRef.current, queryParamsRef.current, { label, export_mode, delimiter, quotechar });
       } catch (error2) {
         setError({ message: `Couldn't download`, originalError: error2 });
         if (throwOnError) {
@@ -218,8 +218,8 @@ function useFabProvideApi({
   const upload = React.useCallback(
     async (file, { delimiter, quotechar } = {}) => {
       try {
-        const response = await uploadItems.uploadItems(pathRef.current, file, { delimiter, quotechar });
         resetError();
+        const response = await uploadItems.uploadItems(pathRef.current, file, { delimiter, quotechar });
         return response;
       } catch (error2) {
         setError({ message: `Couldn't upload`, originalError: error2 });

package/dist/core/cjs/fab-react-toolkit-patch/api/hooks/useProvideBulk.cjs

@@ -5,26 +5,23 @@ const postBulkAction = require("../utils/bulkActions/postBulkAction.cjs");
 const useFabProvideBulk = ({ path }) => {
   const [selectedIds, setSelectedIds] = React.useState([]);
   const [error, setError] = React.useState();
+  const resetError = React.useCallback(() => setError(void 0), []);
   const dispatchBulkActions = React.useCallback(
     async (handler, data) => {
       try {
+        resetError();
         if (data === void 0) {
           data = selectedIds;
         }
         const response = await postBulkAction.postBulk(path, handler, data);
-        setError(void 0);
         return response;
       } catch (error2) {
         setError({ message: `Couldn't perform bulk action`, originalError: error2 });
       }
     },
-    [path, selectedIds]
+    [path, resetError, selectedIds]
   );
   const bulkActions = React.useMemo(() => ({ selectedIds, setSelectedIds }), [selectedIds, setSelectedIds]);
-  return {
-    bulkActions,
-    dispatchBulkActions,
-    error
-  };
+  return { bulkActions, dispatchBulkActions, error, resetError };
 };
 exports.useFabProvideBulk = useFabProvideBulk;

package/dist/core/cjs/fab-react-toolkit-patch/auth/hooks/useProvideAuth.cjs

@@ -13,31 +13,32 @@ function useFabProvideAuth(baseURL, authQueryProps) {
     retry: false,
     ...authQueryProps
   });
-  const [error, setError] = React.useState(null);
+  const [error, setError] = React.useState();
+  const resetError = React.useCallback(() => setError(void 0), []);
   const signin = React.useCallback(
     ({ username, password }) => {
-      setError(null);
+      resetError();
       authFetch.authSignin(baseURL, { username, password }).then(() => queryClient.invalidateQueries({ queryKey: ["user"] })).catch((err) => setError(err));
     },
-    [baseURL, queryClient]
+    [baseURL, queryClient, resetError]
   );
   const signout = React.useCallback(() => {
-    setError(null);
+    resetError();
     authFetch.authSignout(baseURL).then(() => queryClient.resetQueries({ queryKey: ["user"] })).then(() => queryClient.resetQueries({ queryKey: ["info"] })).catch((err) => setError(err));
-  }, [baseURL, queryClient]);
+  }, [baseURL, queryClient, resetError]);
   const update = React.useCallback(
     (data) => {
-      setError(null);
+      resetError();
       userCRUD.updateUser(baseURL, data).then(() => queryClient.invalidateQueries({ queryKey: ["user"] })).catch((err) => setError(err));
     },
-    [baseURL, queryClient]
+    [baseURL, queryClient, resetError]
   );
   const resetPassword = React.useCallback(
     (password) => {
-      setError(null);
+      resetError();
       authFetch.authResetPassword(baseURL, password, query.data).catch((err) => setError(err));
     },
-    [baseURL, query.data]
+    [baseURL, query.data, resetError]
   );
   const oauth_signin = React.useCallback(
     (provider, popup) => authFetch.authOAuthSignin(baseURL, provider, popup, () => queryClient.invalidateQueries({ queryKey: ["user"] })),
@@ -52,7 +53,8 @@ function useFabProvideAuth(baseURL, authQueryProps) {
     update,
     resetPassword,
     oauth_signin,
-    refetch: query.refetch
+    refetch: query.refetch,
+    resetError
   };
 }
 exports.useFabProvideAuth = useFabProvideAuth;

package/dist/core/cjs/hooks/api/useApi.cjs

@@ -1,12 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
 const ApiContext = require("../../Wrappers/ApiProvider/Contexts/ApiContext.cjs");
-const useApi = () => {
-  const context = React.useContext(ApiContext.ApiContext);
-  if (context === void 0) {
-    throw new Error("useApi must be used within a ApiProvider");
-  }
-  return context;
-};
+const useApi = (options) => ApiContext.useApiProvider(options);
 exports.useApi = useApi;

package/dist/core/cjs/hooks/api/useBulkActions.cjs

@@ -1,12 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
 const BulkActionsContext = require("../../Wrappers/ApiProvider/Contexts/BulkActionsContext.cjs");
-const useBulkActions = () => {
-  const context = React.useContext(BulkActionsContext.BulkActionsContext);
-  if (context === void 0) {
-    throw new Error("useBulkActions must be used within a ApiProvider");
-  }
-  return context;
-};
+const useBulkActions = (options) => BulkActionsContext.useBulkActionsProvider(options);
 exports.useBulkActions = useBulkActions;

package/dist/core/cjs/hooks/api/useForms.cjs

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
 const FormContext = require("../../Wrappers/ApiProvider/Contexts/FormContext.cjs");
-const useForms = (type = "add") => {
-  const context = React.useContext(type === "add" ? FormContext.FormContextAdd : FormContext.FormContextEdit);
-  if (context === void 0) {
-    throw new Error("useForms must be used within an ApiProvider");
-  }
-  return context;
-};
+const useForms = (type, options) => (
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  type === "add" ? FormContext.useFormAddProvider(options) : FormContext.useFormEditProvider(options)
+);
 exports.useForms = useForms;

package/dist/core/cjs/hooks/auth/useAuth.cjs

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
 const AuthContext = require("../../Wrappers/Provider/Contexts/AuthContext.cjs");
-const useAuth = () => {
-  return React.useContext(AuthContext.AuthContext);
-};
+const useAuth = (options) => AuthContext.useAuthProvider(options);
 exports.useAuth = useAuth;

package/dist/core/cjs/hooks/auth/useInfo.cjs

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
 const InfoContext = require("../../Wrappers/Provider/Contexts/InfoContext.cjs");
-const useInfo = () => {
-  return React.useContext(InfoContext.InfoContext);
-};
+const useInfo = (options) => InfoContext.useInfoProvider(options);
 exports.useInfo = useInfo;

package/dist/core/esm/Tables/DataGrid/Toolbar/Filter/FilterMenu.mjs

@@ -2,7 +2,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { useProps, Box, Flex, ActionIcon, Divider, Text, ScrollArea, Button, Group } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { randomId } from "@mantine/hooks";
-import { yupResolver } from "../../../../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@8.1.3_yup@1.6.1/mantine-form-yup-resolver/dist/esm/index.mjs";
+import { yupResolver } from "../../../../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@8.2.1_yup@1.6.1/mantine-form-yup-resolver/dist/esm/index.mjs";
 import { useEffect } from "react";
 import { object as create$3, array as create$2, mixed as create$8, string as create$6 } from "../../../../../../.external/esm/yup@1.6.1/yup/index.esm.mjs";
 import { useApi } from "../../../../hooks/api/useApi.mjs";

package/dist/core/esm/Tables/NextGenDataGrid/NextGenDataGrid.mjs

@@ -1,7 +1,7 @@
 import { jsxs, jsx } from "react/jsx-runtime";
 /* empty css                                                                                                                                                                                 */
 /* empty css           */
-import { deepMerge, getItemId } from "fastapi-rtk/utils";
+import { deepMerge, mergeProps, getItemId } from "fastapi-rtk/utils";
 import { useProps, Box } from "@mantine/core";
 import { useMantineReactTable, MantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._ll5dfnmvjphm4bajaxt6oy7mty/mantine-react-table/dist/index.esm.mjs";
 import { forwardRef, useMemo, useEffect } from "react";
@@ -23,7 +23,6 @@ import { useSize } from "./hooks/useSize.mjs";
 import { useSorting } from "./hooks/useSorting.mjs";
 import { useToolbar } from "./hooks/useToolbar/useToolbar.mjs";
 import { useToolbarAlertBanner } from "./hooks/useToolbarAlertBanner/useToolbarAlertBanner.mjs";
-import { getProps } from "./utils.mjs";
 const baseProps = { enableStickyHeader: true, enableColumnPinning: true };
 const NextGenDataGrid = forwardRef((props, ref) => {
   var _a, _b, _c;
@@ -137,7 +136,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
   const paginationProps = usePagination(hidePagination);
   const columnsProps = useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters);
   const sizeProps = useSize(withBorder);
-  const actionsProps = useActions(hideActions, (_a = getProps(body, specialKey.actions)) == null ? void 0 : _a.component);
+  const actionsProps = useActions(hideActions, (_a = mergeProps(body, specialKey.actions)) == null ? void 0 : _a.component);
   const globalFilterProps = useGlobalFilter();
   const toolbarProps = useToolbar(toolbar, quickFilters, hideToolbar, enableAdvancedFilters);
   const eventProps = useEvent(onClickEntry);

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/Body.mjs

@@ -1,17 +1,16 @@
 import { jsx } from "react/jsx-runtime";
-import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
+import { mergeProps, parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { useMemo } from "react";
 import { useApi } from "../../../../hooks/api/useApi.mjs";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import { FallbackWrapper } from "../../FallbackWrapper.mjs";
-import { getProps } from "../../utils.mjs";
 import { MultiLineHighlight } from "./MultiLineHighlight.mjs";
 const Body = ({ body, col, textFilterSeparator, mrtProps }) => {
   const { table, column, cell } = mrtProps;
   const api = useApi();
   const auth = useAuth();
   const { specialKey } = useApi();
-  const { component, separator, truncate, tooltipProps, highlightProps } = getProps(body, specialKey.all, col);
+  const { component, separator, truncate, tooltipProps, highlightProps } = mergeProps(body, specialKey.all, col);
   const highlights = useMemo(() => {
     const globalFilter = table.getState().globalFilter;
     const columnTextFilter = column.getFilterValue();

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilterInput/ColumnHeaderFilterInput.mjs

@@ -1,14 +1,13 @@
 import { jsx } from "react/jsx-runtime";
 import classes from "./headerinput.module.css.mjs";
 import { useSyncValues } from "fastapi-rtk/hooks";
-import { getValueOrDefault, parseFromValuesOrFunc } from "fastapi-rtk/utils";
+import { getValueOrDefault, parseFromValuesOrFunc, mergeProps } from "fastapi-rtk/utils";
 import { Tooltip, Indicator, CloseButton } from "@mantine/core";
 import { useField } from "@mantine/form";
 import { useElementSize, useMergedRef, useDidUpdate } from "@mantine/hooks";
 import { clsx } from "../../../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.mjs";
 import { forwardRef, cloneElement, useMemo, useRef } from "react";
 import { useApi } from "../../../../../hooks/api/useApi.mjs";
-import { getProps } from "../../../utils.mjs";
 import { getBasicInput } from "../utils.mjs";
 import { HeaderInput } from "./HeaderInput.mjs";
 const getLocalStorageValue = (key, defaultValue) => {
@@ -153,7 +152,7 @@ function ColumnHeaderFilterInput({
     [actionIconProps]
   );
   const configuration = parseFromValuesOrFunc(
-    enableFilterModes ? getProps(filterProps, opr) : filterProps,
+    enableFilterModes ? mergeProps(filterProps, opr) : filterProps,
     functionProps
   );
   const headerInputProps = useMemo(

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/FilterModeDescription.mjs

@@ -1,9 +1,9 @@
 import { jsx } from "react/jsx-runtime";
+import { mergeProps } from "fastapi-rtk/utils";
 import { Input } from "@mantine/core";
 import { localizedFilterOption } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._ll5dfnmvjphm4bajaxt6oy7mty/mantine-react-table/dist/index.esm.mjs";
 import { useMemo } from "react";
 import { FallbackWrapper } from "../../FallbackWrapper.mjs";
-import { getProps } from "../../utils.mjs";
 const FilterModeDescription = ({ table, column, opr, filters, filterModeDescription, functionProps }) => {
   const filterName = useMemo(() => {
     var _a;
@@ -14,7 +14,7 @@ const FilterModeDescription = ({ table, column, opr, filters, filterModeDescript
     {
       fallback: filters.length ? /* @__PURE__ */ jsx(Input.Description, { size: "xs", children: table.options.localization.filterMode.replace(
         "{filterType}",
-        localizedFilterOption(getProps(table.options.localization, column.id), filterName) || localizedFilterOption(table.options.localization, filterName) || filterName
+        localizedFilterOption(mergeProps(table.options.localization, column.id), filterName) || localizedFilterOption(table.options.localization, filterName) || filterName
       ) }) : null,
       functionProps: { ...functionProps, componentProps: { value: filterName } },
       children: filterModeDescription

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/useColumns.mjs

@@ -1,11 +1,11 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { getValue, parseFromValuesOrFunc } from "fastapi-rtk/utils";
+import { mergeProps, getValue, parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { Flex } from "@mantine/core";
 import { useMap, useSetState } from "@mantine/hooks";
 import { useEffect, useMemo } from "react";
 import { useApi } from "../../../../hooks/api/useApi.mjs";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
-import { getProps, fromFilterToFilterFn } from "../../utils.mjs";
+import { fromFilterToFilterFn } from "../../utils.mjs";
 import { Body } from "./Body.mjs";
 import { ColumnHeaderFilter } from "./ColumnHeaderFilter.mjs";
 import { HeaderAdvancedFiltersMenuButton } from "./HeaderAdvancedFiltersMenuButton.mjs";
@@ -37,7 +37,7 @@ function useColumns(columnProps, header, body, textFilterSeparator, enableAdvanc
         withLocalStorage,
         localStorageKey,
         defaultOpr = ((_d = (_c = (_b = (_a = info == null ? void 0 : info.filters) == null ? void 0 : _a[col]) == null ? void 0 : _b.filters) == null ? void 0 : _c[0]) == null ? void 0 : _d.operator) || ""
-      } = getProps(header, specialKey.all, col);
+      } = mergeProps(header, specialKey.all, col);
       const filterFn = fromFilterToFilterFn(col, defaultOpr);
       const filters = ((_f = (_e = info == null ? void 0 : info.filters) == null ? void 0 : _e[col]) == null ? void 0 : _f.filters) || [];
       const additionalProps = {};
@@ -51,7 +51,7 @@ function useColumns(columnProps, header, body, textFilterSeparator, enableAdvanc
         Header: enableAdvancedFilters ? (props) => {
           var _a2, _b2;
           return /* @__PURE__ */ jsxs(Flex, { gap: "2px", style: { placeItems: "center" }, children: [
-            ((_a2 = getProps(columnProps, specialKey.all, col)) == null ? void 0 : _a2.header) ?? ((_b2 = data == null ? void 0 : data.label_columns) == null ? void 0 : _b2[col]),
+            ((_a2 = mergeProps(columnProps, specialKey.all, col)) == null ? void 0 : _a2.header) ?? ((_b2 = data == null ? void 0 : data.label_columns) == null ? void 0 : _b2[col]),
             /* @__PURE__ */ jsx(HeaderAdvancedFiltersMenuButton, { filters, mrtProps: props })
           ] });
         } : void 0,
@@ -79,7 +79,7 @@ function useColumns(columnProps, header, body, textFilterSeparator, enableAdvanc
         columnFilterModeOptions: filters.map((f) => fromFilterToFilterFn(col, f.operator)),
         Cell: (props) => /* @__PURE__ */ jsx(Body, { body, col, textFilterSeparator, mrtProps: props }),
         ...additionalProps,
-        ...getProps(columnProps, specialKey.all, col)
+        ...mergeProps(columnProps, specialKey.all, col)
       };
     })) || [],
     [

package/dist/core/esm/Tables/NextGenDataGrid/utils.mjs

@@ -1,5 +1,3 @@
-import { deepMerge } from "fastapi-rtk/utils";
-const getProps = (propsObj = {}, ...keys) => keys.reduce((acc, key) => deepMerge(acc, propsObj[key]), {});
 const fromFilterToFilterFn = (columnId, operator, filterPrefix = false) => {
   let word = "";
   if (filterPrefix) {
@@ -18,6 +16,5 @@ const fromFilterFnToFilter = (filterKey = "") => {
 };
 export {
   fromFilterFnToFilter,
-  fromFilterToFilterFn,
-  getProps
+  fromFilterToFilterFn
 };

package/dist/core/esm/Wrappers/ApiProvider/ApiProvider.mjs

@@ -5,9 +5,9 @@ import { useState } from "react";
 import { useFabProvideApi } from "../../fab-react-toolkit-patch/api/hooks/useProvideApi.mjs";
 import { useFabProvideBulk } from "../../fab-react-toolkit-patch/api/hooks/useProvideBulk.mjs";
 import { useInfo } from "../../hooks/auth/useInfo.mjs";
-import { ApiContext } from "./Contexts/ApiContext.mjs";
-import { BulkActionsContext } from "./Contexts/BulkActionsContext.mjs";
-import { FormContextAdd, FormContextEdit } from "./Contexts/FormContext.mjs";
+import { ApiContextProvider } from "./Contexts/ApiContext.mjs";
+import { BulkActionsContextProvider } from "./Contexts/BulkActionsContext.mjs";
+import { FormContextAddProvider, FormContextEditProvider } from "./Contexts/FormContext.mjs";
 import { useProvideApi } from "./hooks/useProvideApi.mjs";
 import { useProvideBulk } from "./hooks/useProvideBulk.mjs";
 import { useProvideForm } from "./hooks/useProvideForm.mjs";
@@ -60,7 +60,7 @@ function ApiProvider({
   const [formAddProxy] = useState(() => createProxy(formAdd));
   const formEdit = useProvideForm();
   const [formEditProxy] = useState(() => createProxy(formEdit));
-  return /* @__PURE__ */ jsx(ApiContext.Provider, { value: apiProxy, children: /* @__PURE__ */ jsx(BulkActionsContext.Provider, { value: bulkActionsProxy, children: /* @__PURE__ */ jsx(FormContextAdd.Provider, { value: formAddProxy, children: /* @__PURE__ */ jsx(FormContextEdit.Provider, { value: formEditProxy, children }) }) }) });
+  return /* @__PURE__ */ jsx(ApiContextProvider, { value: apiProxy, children: /* @__PURE__ */ jsx(BulkActionsContextProvider, { value: bulkActionsProxy, children: /* @__PURE__ */ jsx(FormContextAddProvider, { value: formAddProxy, children: /* @__PURE__ */ jsx(FormContextEditProvider, { value: formEditProxy, children }) }) }) });
 }
 export {
   ApiProvider