fastapi-rtk 0.1.25 → 0.1.27

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilter.cjs

@@ -6,13 +6,13 @@ const React = require("react");
 const useApi = require("../../../../hooks/api/useApi.cjs");
 const useAuth = require("../../../../hooks/auth/useAuth.cjs");
 const utils = require("../../utils.cjs");
+const BasicFilters = require("./BasicFilters.cjs");
 const ColumnHeaderFilterInput = require("./ColumnHeaderFilterInput/ColumnHeaderFilterInput.cjs");
 const FilterMenuButton = require("./FilterMenuButton.cjs");
 const FilterModeDescription = require("./FilterModeDescription.cjs");
 const ColumnHeaderFilter = ({
   children,
   enableFilterModes,
-  enableAdvancedFilters,
   filters,
   filterFn,
   filterProps,
@@ -61,13 +61,11 @@ const ColumnHeaderFilter = ({
         FilterMenuButton.FilterMenuButton,
         {
           table,
-          column,
-          opr,
           filters,
-          enableAdvancedFilters,
           filterMenu,
           actionIconProps,
-          functionProps
+          functionProps,
+          children: /* @__PURE__ */ jsxRuntime.jsx(BasicFilters.BasicFilters, { filters, col: column.id, opr, table })
         }
       )
     ] }),

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilterInput/ColumnHeaderFilterInput.cjs

@@ -54,22 +54,9 @@ function ColumnHeaderFilterInput({
   const field = form.useField({ mode: "controlled" });
   hooks$1.useSyncValues(
     [
-      {
-        value: field.getValue(),
-        onChange: field.getInputProps().onChange,
-        log: (value) => console.log(`Field value changed to: ${value}`)
-      },
-      ...filterState ? [
-        {
-          ...filterState,
-          log: (value) => console.log(`filterState value changed to: ${value}`)
-        }
-      ] : [],
-      {
-        value: column.getFilterValue(),
-        onChange: column.setFilterValue,
-        log: (value) => console.log(`Column filter value changed to: ${value}`)
-      },
+      { value: field.getValue(), onChange: field.getInputProps().onChange },
+      { value: column.getFilterValue(), onChange: column.setFilterValue },
+      ...filterState ? [filterState] : [],
       ...updateQueryParams ? [
         {
           value: (_b = (_a = queryParams == null ? void 0 : queryParams.filters) == null ? void 0 : _a.find((qpFilter) => qpFilter.id === column.id)) == null ? void 0 : _b.value,
@@ -93,8 +80,7 @@ function ColumnHeaderFilterInput({
               }
               return { ...prev, filters: newFilters };
             });
-          },
-          log: (value) => console.log(`Query Params filter value changed to: ${value}`)
+          }
         }
       ] : []
     ],

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/FilterMenuButton.cjs

@@ -4,68 +4,43 @@ const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
 const hooks = require("@mantine/hooks");
 const React = require("react");
-const useApi = require("../../../../hooks/api/useApi.cjs");
 const FallbackWrapper = require("../../FallbackWrapper.cjs");
-const FilterMenu = require("./FilterMenu.cjs");
 const IconFilterCog = require("../../../../../../.external/cjs/@tabler_icons-react@3.18.0_react@18.3.1/@tabler/icons-react/dist/esm/icons/IconFilterCog.cjs");
-const FilterMenuButton = ({
-  table,
-  column,
-  opr,
-  filters,
-  enableAdvancedFilters,
-  filterMenu,
-  actionIconProps,
-  functionProps
-}) => {
-  const { queryParams } = useApi.useApi();
-  const [opened, { toggle }] = hooks.useDisclosure();
-  const [mode, setMode] = React.useState("Basic");
-  const existingFilters = React.useMemo(
-    () => (queryParams == null ? void 0 : queryParams.filters.filter((filter) => filter.id !== column.id && filter.col === column.id).map((filter) => ({ ...filter }))) || [],
-    [queryParams, column.id]
-  );
-  return /* @__PURE__ */ jsxRuntime.jsxs(core.Menu, { opened, closeOnClickOutside: true, onChange: toggle, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Target, { children: /* @__PURE__ */ jsxRuntime.jsx(
-      FallbackWrapper.FallbackWrapper,
-      {
-        fallback: filters.length ? /* @__PURE__ */ jsxRuntime.jsx(
-          FilterIconWrapper,
-          {
-            label: table.options.localization.changeFilterMode,
-            position: "bottom-start",
-            withArrow: true,
-            arrowPosition: "side",
-            children: /* @__PURE__ */ jsxRuntime.jsx(FilterIndicatorWrapper, { indicator: existingFilters.length, children: /* @__PURE__ */ jsxRuntime.jsx(core.ActionIcon, { ...actionIconProps, onClick: toggle, children: /* @__PURE__ */ jsxRuntime.jsx(IconFilterCog, {}) }) })
-          }
-        ) : null,
-        functionProps: {
-          ...functionProps,
-          componentProps: {
-            label: table.options.localization.changeFilterMode,
-            disabled: !(filters == null ? void 0 : filters.length),
-            indicator: existingFilters.length,
-            actionIconProps,
-            onClick: toggle
-          }
-        },
-        children: filterMenu
-      }
-    ) }),
-    /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Dropdown, { children: /* @__PURE__ */ jsxRuntime.jsx(
-      FilterMenu.FilterMenu,
-      {
-        enableAdvancedFilters,
-        mode,
-        setMode,
-        col: column.id,
-        opr,
-        filters,
-        table
-      }
-    ) })
-  ] });
-};
+const FilterMenuButton = React.forwardRef(
+  ({ table, filters, filterMenu, filterIconWrapperProps, actionIconProps, functionProps, children }, ref) => {
+    const [opened, { toggle }] = hooks.useDisclosure();
+    return /* @__PURE__ */ jsxRuntime.jsxs(core.Menu, { opened, closeOnClickOutside: true, onChange: toggle, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Target, { ref, children: /* @__PURE__ */ jsxRuntime.jsx(
+        FallbackWrapper.FallbackWrapper,
+        {
+          fallback: filters.length ? /* @__PURE__ */ jsxRuntime.jsx(
+            FilterIconWrapper,
+            {
+              label: table.options.localization.changeFilterMode,
+              position: "bottom-start",
+              withArrow: true,
+              arrowPosition: "side",
+              ...filterIconWrapperProps,
+              children: /* @__PURE__ */ jsxRuntime.jsx(core.ActionIcon, { ...actionIconProps, onClick: toggle, children: /* @__PURE__ */ jsxRuntime.jsx(IconFilterCog, {}) })
+            }
+          ) : null,
+          functionProps: {
+            ...functionProps,
+            componentProps: {
+              label: table.options.localization.changeFilterMode,
+              disabled: !(filters == null ? void 0 : filters.length),
+              actionIconProps,
+              onClick: toggle
+            }
+          },
+          children: filterMenu
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Dropdown, { children })
+    ] });
+  }
+);
+FilterMenuButton.displayName = "FilterMenuButton";
 const FilterIconWrapper = React.forwardRef(({ label, disabled, children, ...props }, ref) => {
   if (disabled) {
     return React.cloneElement(children, { ref });
@@ -73,15 +48,4 @@ const FilterIconWrapper = React.forwardRef(({ label, disabled, children, ...prop
   return /* @__PURE__ */ jsxRuntime.jsx(core.Tooltip, { label, ...props, children: React.cloneElement(children, { ref }) });
 });
 FilterIconWrapper.displayName = "FilterIconWrapper";
-const FilterIndicatorWrapper = React.forwardRef(({ indicator, children, ...props }, ref) => {
-  const { height, ref: elementRef } = hooks.useElementSize();
-  const combinedRefs = hooks.useMergedRef(ref, elementRef);
-  if (!indicator) {
-    return React.cloneElement(children, { ref: combinedRefs });
-  }
-  const heightOffset = 2;
-  //! This is the height offset between the button from ActionIcon and the icon itself
-  return /* @__PURE__ */ jsxRuntime.jsx(core.Indicator, { zIndex: 20, size: 16, label: indicator, styles: { root: { height: height + heightOffset } }, ...props, children: React.cloneElement(children, { ref: combinedRefs }) });
-});
-FilterIndicatorWrapper.displayName = "FilterIndicatorWrapper";
 exports.FilterMenuButton = FilterMenuButton;

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/FilterModeDescription.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
-const index_esm = require("../../../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/mantine-react-table/dist/index.esm.cjs");
+const index_esm = require("../../../../../../.external/cjs/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.cjs");
 const React = require("react");
 const FallbackWrapper = require("../../FallbackWrapper.cjs");
 const utils = require("../../utils.cjs");

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/HeaderAdvancedFiltersMenuButton.cjs

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const jsxRuntime = require("react/jsx-runtime");
+const core = require("@mantine/core");
+const React = require("react");
+const useApi = require("../../../../hooks/api/useApi.cjs");
+const useAuth = require("../../../../hooks/auth/useAuth.cjs");
+const AdvancedFilters = require("./AdvancedFilters.cjs");
+const FilterMenuButton = require("./FilterMenuButton.cjs");
+const HeaderAdvancedFiltersMenuButton = ({ filters, mrtProps }) => {
+  const { table, column } = mrtProps;
+  const api = useApi.useApi();
+  const auth = useAuth.useAuth();
+  const functionProps = React.useMemo(() => ({ api, auth, mrtProps }), [api, auth, mrtProps]);
+  const actionIconProps = React.useMemo(() => {
+    const props = { variant: "subtle", size: "xs" };
+    const disabled = !(filters == null ? void 0 : filters.length);
+    if (disabled) {
+      props.disabled = true;
+      props.c = "gray";
+    }
+    return props;
+  }, [filters == null ? void 0 : filters.length]);
+  const { queryParams } = useApi.useApi();
+  const existingFilters = React.useMemo(
+    () => (queryParams == null ? void 0 : queryParams.filters.filter((filter) => filter.id !== column.id && filter.col === column.id).map((filter) => ({ ...filter }))) || [],
+    [queryParams, column.id]
+  );
+  return /* @__PURE__ */ jsxRuntime.jsx(core.Center, { onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ jsxRuntime.jsx(
+    core.Tooltip,
+    {
+      label: /* @__PURE__ */ jsxRuntime.jsx(core.Badge, { size: "xs", circle: true, children: existingFilters.length }),
+      position: "top",
+      color: "transparent",
+      p: 0,
+      offset: { mainAxis: -8, crossAxis: 8 },
+      opened: true,
+      disabled: !existingFilters.length,
+      children: /* @__PURE__ */ jsxRuntime.jsx(
+        FilterMenuButton.FilterMenuButton,
+        {
+          table,
+          filters,
+          filterIconWrapperProps: {
+            label: table.options.localization.advancedFilters ?? "Advanced Filters",
+            position: "top",
+            withArrow: false,
+            openDelay: 1e3
+          },
+          actionIconProps,
+          functionProps,
+          children: /* @__PURE__ */ jsxRuntime.jsx(AdvancedFilters.AdvancedFilters, { col: column.id })
+        }
+      )
+    }
+  ) });
+};
+exports.HeaderAdvancedFiltersMenuButton = HeaderAdvancedFiltersMenuButton;

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/useColumns.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const utils$1 = require("fastapi-rtk/utils");
+const core = require("@mantine/core");
 const hooks = require("@mantine/hooks");
 const React = require("react");
 const useApi = require("../../../../hooks/api/useApi.cjs");
@@ -9,7 +10,8 @@ const useAuth = require("../../../../hooks/auth/useAuth.cjs");
 const utils = require("../../utils.cjs");
 const Body = require("./Body.cjs");
 const ColumnHeaderFilter = require("./ColumnHeaderFilter.cjs");
-function useColumns(columnProps, header, body, textFilterSeparator) {
+const HeaderAdvancedFiltersMenuButton = require("./HeaderAdvancedFiltersMenuButton.cjs");
+function useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters) {
   const { path, info, data, specialKey } = useApi.useApi();
   const api = useApi.useApi();
   const auth = useAuth.useAuth();
@@ -27,7 +29,6 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
       const {
         component,
         enableFilterModes,
-        enableAdvancedFilters,
         filterComponent,
         filterProps,
         filterState,
@@ -47,12 +48,18 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
         accessorKey: col,
         accessorFn: (row) => utils$1.getValue(row, col),
         header: (_g = data == null ? void 0 : data.label_columns) == null ? void 0 : _g[col],
+        Header: enableAdvancedFilters ? (props) => {
+          var _a2, _b2;
+          return /* @__PURE__ */ jsxRuntime.jsxs(core.Flex, { gap: "2px", style: { placeItems: "center" }, children: [
+            ((_a2 = utils.getProps(columnProps, specialKey.all, col)) == null ? void 0 : _a2.header) ?? ((_b2 = data == null ? void 0 : data.label_columns) == null ? void 0 : _b2[col]),
+            /* @__PURE__ */ jsxRuntime.jsx(HeaderAdvancedFiltersMenuButton.HeaderAdvancedFiltersMenuButton, { filters, mrtProps: props })
+          ] });
+        } : void 0,
         filterTooltipValueFn: (value) => idValueMap.get(`${data == null ? void 0 : data.path}-${col}-${value}`) ?? value,
-        Filter: (props) => /* @__PURE__ */ jsxRuntime.jsx(
+        Filter: (props) => enableAdvancedFilters ? null : /* @__PURE__ */ jsxRuntime.jsx(
           ColumnHeaderFilter.ColumnHeaderFilter,
           {
             enableFilterModes,
-            enableAdvancedFilters,
             filters,
             filterFn,
             filterProps,
@@ -85,6 +92,7 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
       api,
       auth,
       idValueMap,
+      enableAdvancedFilters,
       body,
       textFilterSeparator
     ]

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useToolbar/basicToolbars.cjs

@@ -1,21 +1,27 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
-const index_esm = require("../../../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/mantine-react-table/dist/index.esm.cjs");
+const index_esm = require("../../../../../../.external/cjs/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.cjs");
 const Add = require("../../../../ActionIcons/Add/Add.cjs");
 const Download = require("../../../../ActionIcons/Download/Download.cjs");
 const Refresh = require("../../../../ActionIcons/Refresh/Refresh.cjs");
 function getBasicToolbars(table, rules) {
-  return {
+  const toolbars = {
     toggleGlobalFilter: /* @__PURE__ */ jsxRuntime.jsx(index_esm.MRT_ToggleGlobalFilterButton, { table, disabled: false }, "basic-toggleGlobalFilter"),
     filter: /* @__PURE__ */ jsxRuntime.jsx(index_esm.MRT_ToggleFiltersButton, { table }, "basic-filter"),
     refresh: /* @__PURE__ */ jsxRuntime.jsx(Refresh.Refresh, { tooltipProps: { label: table.options.localization.refresh } }, "basic-refresh"),
-    add: (rules == null ? void 0 : rules.add) && /* @__PURE__ */ jsxRuntime.jsx(Add.Add, { tooltipProps: { label: table.options.localization.add } }, "basic-add"),
-    download: (rules == null ? void 0 : rules.download) && /* @__PURE__ */ jsxRuntime.jsx(Download.Download, { tooltipProps: { label: table.options.localization.download } }, "basic-download"),
-    // upload: rules?.upload && <Upload key="basic-upload" tooltipProps={{ label: table.options.localization.upload }} />, //! Disabled until further notice
+    add: /* @__PURE__ */ jsxRuntime.jsx(Add.Add, { tooltipProps: { label: table.options.localization.add } }, "basic-add"),
+    download: /* @__PURE__ */ jsxRuntime.jsx(Download.Download, { tooltipProps: { label: table.options.localization.download } }, "basic-download"),
+    // upload: <Upload key="basic-upload" tooltipProps={{ label: table.options.localization.upload }} />, //! Disabled until further notice
     showHideColumns: /* @__PURE__ */ jsxRuntime.jsx(index_esm.MRT_ShowHideColumnsButton, { table }, "basic-showHideColumns"),
     toggleDensePadding: /* @__PURE__ */ jsxRuntime.jsx(index_esm.MRT_ToggleDensePaddingButton, { table }, "basic-toggleDensePadding"),
     toggleFullScreen: /* @__PURE__ */ jsxRuntime.jsx(index_esm.MRT_ToggleFullScreenButton, { table }, "basic-toggleFullScreen")
   };
+  Object.entries(rules).forEach(([key, value]) => {
+    if (!value) {
+      toolbars[key] = null;
+    }
+  });
+  return toolbars;
 }
 exports.getBasicToolbars = getBasicToolbars;

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useToolbar/useToolbar.cjs

@@ -25,7 +25,7 @@ function renderCustomizedToolbars(customizer, basicToolbarsObj, functionProps, c
   });
   return /* @__PURE__ */ jsxRuntime.jsx(core.Flex, { gap: "0.125rem", align: "center", children: toolbars });
 }
-function useToolbar(toolbar = {}, quickFilters, hideToolbar) {
+function useToolbar(toolbar = {}, quickFilters, hideToolbar, enableAdvancedFilters) {
   const { info, queryParams, setQueryParams } = useApi.useApi();
   const api = useApi.useApi();
   const auth = useAuth.useAuth();
@@ -60,6 +60,7 @@ function useToolbar(toolbar = {}, quickFilters, hideToolbar) {
         mrtProps: { table }
       };
       const rules = {
+        filter: !enableAdvancedFilters,
         add: info == null ? void 0 : info.permissions.includes("can_post"),
         download: info == null ? void 0 : info.permissions.includes("can_download"),
         upload: info == null ? void 0 : info.permissions.includes("can_upload")
@@ -67,7 +68,7 @@ function useToolbar(toolbar = {}, quickFilters, hideToolbar) {
       const basicToolbarsObj = basicToolbars.getBasicToolbars(table, rules);
       return renderCustomizedToolbars(customizer, basicToolbarsObj, functionProps, custom);
     },
-    [api, auth, custom, customizer, info == null ? void 0 : info.permissions]
+    [api, auth, custom, customizer, enableAdvancedFilters, info == null ? void 0 : info.permissions]
   );
   return {
     renderToolbarInternalActions,

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useToolbarAlertBanner/FASTAPI_RTK_ToolbarAlertBanner.cjs

@@ -4,7 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const utils = require("fastapi-rtk/utils");
 const core = require("@mantine/core");
 const clsx = require("../../../../../../.external/cjs/clsx@2.1.1/clsx/dist/clsx.cjs");
-const index_esm = require("../../../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/mantine-react-table/dist/index.esm.cjs");
+const index_esm = require("../../../../../../.external/cjs/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.cjs");
 const React = require("react");
 const FASTAPI_RTK_ToolbarAlertBanner_module = require("./FASTAPI_RTK_ToolbarAlertBanner.module.css.cjs");
 const FASTAPI_RTK_ToolbarAlertBanner = ({ alertBanner, table, ...rest }) => {

package/dist/core/cjs/Wrappers/ApiProvider/Contexts/ApiContext.cjs

@@ -4,7 +4,7 @@ const React = require("react");
 const ApiContext = React.createContext({
   path: "",
   /**
-   * @type {{count: number, description_columns: Record<string, string>, ids: number[] | string[], label_columns: Record<string, string>, list_columns: string[], list_title: string, order_columns: string[], result: Record<string, any>[], path: string} | null}
+   * @type {{count: number, description_columns: Record<string, string>, ids: number[] | string[], label_columns: Record<string, string>, list_columns: string[], list_title: string, order_columns: string[], result: Record<string, any>[], path: string, queryParams: Record<string, any>} | null}
    */
   data: null,
   /**

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const utils = require("fastapi-rtk/utils");
 const hooks = require("@mantine/hooks");
-const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
+const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
 const createItem = require("../utils/api/createItem.cjs");
 const deleteItem = require("../utils/api/deleteItem.cjs");
 const downloadItems = require("../utils/api/downloadItems.cjs");
@@ -15,7 +15,7 @@ const uploadItems = require("../utils/api/uploadItems.cjs");
 const convertId = require("../utils/convertId.cjs");
 const convertInfo = require("../utils/convertInfo.cjs");
 const createQueryParams = require("../utils/createQueryParams.cjs");
-const utils$1 = require("../../../../../.external/cjs/@tanstack_query-core@5.77.2/@tanstack/query-core/build/modern/utils.cjs");
+const utils$1 = require("../../../../../.external/cjs/@tanstack_query-core@5.80.6/@tanstack/query-core/build/modern/utils.cjs");
 function useProvideApi({
   path,
   initialQueryParams,
@@ -112,7 +112,8 @@ function useProvideApi({
     queryFn: ({ signal }) => memoizedQueryParams ? getItems.getItems(utils.urlJoin(memoizedQueryParamsPathRef.current, "/"), memoizedQueryParams, signal).then((data2) => ({
       ...data2,
       result: data2.result.map((item, index) => ({ ...item, id: data2.ids[index] })),
-      path: memoizedQueryParamsPathRef.current
+      path: memoizedQueryParamsPathRef.current,
+      queryParams: memoizedQueryParams
     })) : null,
     placeholderData: clearDataOnRefetch ? null : utils$1.keepPreviousData,
     retry: false,
@@ -232,16 +233,8 @@ function useProvideApi({
   const [streaming, setStreaming] = hooks.useSetState({
     data: {},
     isEnd: false,
-    fetch: () => null
+    fetch: streamingMode ? () => setQueryParamsCallback({ page: 0, streaming: true }) : () => null
   });
-  React.useEffect(() => {
-    if (!streamingMode) {
-      return;
-    }
-    setStreaming({
-      fetch: () => setQueryParamsCallback({ page: 0, streaming: true })
-    });
-  }, [setQueryParamsCallback, setStreaming, streamingMode]);
   React.useEffect(() => {
     if (!streamingMode) {
       return;
@@ -250,19 +243,21 @@ function useProvideApi({
       return;
     }
     setStreaming((prev) => {
-      let latestPage = Object.keys(prev.data).length;
+      var _a;
       const newStreaming = { isEnd: false };
-      if (memoizedQueryParams.page < latestPage) {
-        latestPage = memoizedQueryParams.page;
-        newStreaming.data = { [memoizedQueryParams.page]: data.result };
+      const currentPage = Object.keys(prev.data).length;
+      const nextPage = ((_a = data.queryParams) == null ? void 0 : _a.page) ?? 0;
+      if (nextPage < currentPage) {
+        newStreaming.data = {};
       } else {
-        newStreaming.data = { ...prev.data, [memoizedQueryParams.page]: data.result };
+        newStreaming.data = { ...prev.data };
       }
-      if (data.result.length < memoizedQueryParams.page_size) {
+      newStreaming.data[nextPage] = data.result;
+      if (data.result.length < data.queryParams.page_size) {
         newStreaming.isEnd = true;
         newStreaming.fetch = () => null;
       } else {
-        newStreaming.fetch = () => setQueryParamsCallback({ page: latestPage + 1, streaming: true });
+        newStreaming.fetch = () => setQueryParamsCallback({ page: nextPage + 1, streaming: true });
       }
       return newStreaming;
     });

package/dist/core/cjs/Wrappers/InfiniteScroll/InfiniteScroll.cjs

@@ -1,32 +1,33 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const utils = require("fastapi-rtk/utils");
 const core = require("@mantine/core");
 const hooks = require("@mantine/hooks");
 const React = require("react");
 const useApi = require("../../hooks/api/useApi.cjs");
-function InfiniteScroll({
+const InfiniteScroll = ({
   children,
   fetch = true,
-  loading: Loading = /* @__PURE__ */ jsxRuntime.jsx(core.Center, { children: /* @__PURE__ */ jsxRuntime.jsx(core.Loader, {}) }),
-  end: End = /* @__PURE__ */ jsxRuntime.jsx(core.Center, { children: "End of data" }),
-  fetchWrapper: FetchWrapper = core.Center,
+  components: {
+    Loading = /* @__PURE__ */ jsxRuntime.jsx(core.Center, { children: /* @__PURE__ */ jsxRuntime.jsx(core.Loader, {}) }),
+    End = /* @__PURE__ */ jsxRuntime.jsx(core.Center, { children: "End of data" }),
+    FetchWrapper = core.Center
+  } = {},
   fetchWrapperProps
-}) {
+}) => {
   const { streaming, loading } = useApi.useApi();
   const { ref, inViewport } = hooks.useInViewport();
   const items = React.useMemo(() => Object.values(streaming.data).flat(), [streaming.data]);
-  const Children = React.useMemo(() => typeof children === "function" ? children(items) : children, [children, items]);
   React.useEffect(() => {
     if (inViewport && fetch) {
       streaming.fetch();
     }
-  }, [inViewport]);
+  }, [fetch, inViewport]);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    Children,
-    loading && Loading,
+    utils.parseFromValuesOrFunc(children, { items, loading }),
     streaming.isEnd && End,
-    /* @__PURE__ */ jsxRuntime.jsx(FetchWrapper, { ref, id: "IS-load-trigger", mih: "1%", ...fetchWrapperProps })
+    loading ? Loading : /* @__PURE__ */ jsxRuntime.jsx(FetchWrapper, { ref, id: "IS-load-trigger", mih: "1%", ...fetchWrapperProps })
   ] });
-}
+};
 exports.InfiniteScroll = InfiniteScroll;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const zustand = require("fastapi-rtk/zustand");
-const queryClient = require("../../../../.external/cjs/@tanstack_query-core@5.77.2/@tanstack/query-core/build/modern/queryClient.cjs");
-const QueryClientProvider = require("../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.cjs");
+const queryClient = require("../../../../.external/cjs/@tanstack_query-core@5.80.6/@tanstack/query-core/build/modern/queryClient.cjs");
+const QueryClientProvider = require("../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.cjs");
 const React = require("react");
 const useProvideAuth = require("../../fab-react-toolkit-patch/auth/hooks/useProvideAuth.cjs");
 const useProvideInfo = require("../../fab-react-toolkit-patch/auth/hooks/useProvideInfo.cjs");
@@ -33,7 +33,7 @@ function InnerProvider(props) {
   return /* @__PURE__ */ jsxRuntime.jsx(AuthContext.AuthContext.Provider, { value: authProxy, children: /* @__PURE__ */ jsxRuntime.jsx(InfoContext.InfoContext.Provider, { value: infoProxy, children }) });
 }
 const Provider = (props) => {
-  const [queryClient$1] = React.useState(() => new queryClient.QueryClient());
+  const [queryClient$1] = React.useState(() => new queryClient.QueryClient(props.queryClientProps));
   return /* @__PURE__ */ jsxRuntime.jsx(QueryClientProvider.QueryClientProvider, { client: queryClient$1, children: /* @__PURE__ */ jsxRuntime.jsx(InnerProvider, { ...props }) });
 };
 exports.Provider = Provider;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
-const QueryClientProvider = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.cjs");
+const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
+const QueryClientProvider = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.cjs");
 const React = require("react");
 const authFetch = require("../utils/authFetch.cjs");
 const userCRUD = require("../utils/userCRUD.cjs");

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
+const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
 const React = require("react");
 const authFetch = require("../utils/authFetch.cjs");
 function useProvideInfo(baseUrl, auth) {

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const utils = require("fastapi-rtk/utils");
 const hooks = require("@mantine/hooks");
-const utils$1 = require("../../../../../.external/cjs/@tanstack_query-core@5.77.2/@tanstack/query-core/build/modern/utils.cjs");
-const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
+const utils$1 = require("../../../../../.external/cjs/@tanstack_query-core@5.80.6/@tanstack/query-core/build/modern/utils.cjs");
+const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
 const createItem = require("../utils/api/createItem.cjs");
 const deleteItem = require("../utils/api/deleteItem.cjs");
 const downloadItems = require("../utils/api/downloadItems.cjs");
@@ -112,7 +112,8 @@ function useFabProvideApi({
     queryFn: ({ signal }) => memoizedQueryParams ? getItems.getItems(utils.urlJoin(memoizedQueryParamsPathRef.current, "/"), memoizedQueryParams, signal).then((data2) => ({
       ...data2,
       result: data2.result.map((item, index) => ({ ...item, id: data2.ids[index] })),
-      path: memoizedQueryParamsPathRef.current
+      path: memoizedQueryParamsPathRef.current,
+      queryParams: memoizedQueryParams
     })) : null,
     placeholderData: clearDataOnRefetch ? null : utils$1.keepPreviousData,
     retry: false,
@@ -232,16 +233,8 @@ function useFabProvideApi({
   const [streaming, setStreaming] = hooks.useSetState({
     data: {},
     isEnd: false,
-    fetch: () => null
+    fetch: streamingMode ? () => setQueryParamsCallback({ page: 0, streaming: true }) : () => null
   });
-  React.useEffect(() => {
-    if (!streamingMode) {
-      return;
-    }
-    setStreaming({
-      fetch: () => setQueryParamsCallback({ page: 0, streaming: true })
-    });
-  }, [setQueryParamsCallback, setStreaming, streamingMode]);
   React.useEffect(() => {
     if (!streamingMode) {
       return;
@@ -250,19 +243,21 @@ function useFabProvideApi({
       return;
     }
     setStreaming((prev) => {
-      let latestPage = Object.keys(prev.data).length;
+      var _a;
       const newStreaming = { isEnd: false };
-      if (memoizedQueryParams.page < latestPage) {
-        latestPage = memoizedQueryParams.page;
-        newStreaming.data = { [memoizedQueryParams.page]: data.result };
+      const currentPage = Object.keys(prev.data).length;
+      const nextPage = ((_a = data.queryParams) == null ? void 0 : _a.page) ?? 0;
+      if (nextPage < currentPage) {
+        newStreaming.data = {};
       } else {
-        newStreaming.data = { ...prev.data, [memoizedQueryParams.page]: data.result };
+        newStreaming.data = { ...prev.data };
       }
-      if (data.result.length < memoizedQueryParams.page_size) {
+      newStreaming.data[nextPage] = data.result;
+      if (data.result.length < data.queryParams.page_size) {
         newStreaming.isEnd = true;
         newStreaming.fetch = () => null;
       } else {
-        newStreaming.fetch = () => setQueryParamsCallback({ page: latestPage + 1, streaming: true });
+        newStreaming.fetch = () => setQueryParamsCallback({ page: nextPage + 1, streaming: true });
       }
       return newStreaming;
     });

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
-const QueryClientProvider = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.cjs");
+const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
+const QueryClientProvider = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.cjs");
 const React = require("react");
 const authFetch = require("../utils/authFetch.cjs");
 const userCRUD = require("../utils/userCRUD.cjs");