fastapi-rtk 2.1.4 → 2.2.0

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

@@ -1,30 +1,32 @@
 import { jsx } from "react/jsx-runtime";
 import { Center, Tooltip, Badge } from "@mantine/core";
 import { useMemo } from "react";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useTranslation, useApi } from "fastapi-rtk/contexts";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
-import "../../../../Wrappers/Provider/Contexts/LangContext.mjs";
 import { AdvancedFilters } from "./AdvancedFilters.mjs";
 import { FilterMenuButton } from "./FilterMenuButton.mjs";
-import { useTranslation } from "../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.8.0_typescript@5.9.3__react-dom@19.2.3_react@19.2.3__react@19.2.3_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
-const HeaderAdvancedFiltersMenuButton = ({ filters, mrtProps }) => {
+const HeaderAdvancedFiltersMenuButton = (props) => {
+  const { filters, mrtProps } = props;
   const { t } = useTranslation();
   const { table, column } = mrtProps;
   const api = useApi();
   const auth = useAuth();
   const functionProps = useMemo(() => ({ api, auth, mrtProps }), [api, auth, mrtProps]);
   const actionIconProps = useMemo(() => {
-    const props = { variant: "subtle", size: "xs" };
+    const props2 = { variant: "subtle", size: "xs" };
     const disabled = !(filters == null ? void 0 : filters.length);
     if (disabled) {
-      props.disabled = true;
-      props.c = "gray";
+      props2.disabled = true;
+      props2.c = "gray";
     }
-    return props;
+    return props2;
   }, [filters == null ? void 0 : filters.length]);
   const { queryParams } = useApi();
   const existingFilters = useMemo(
-    () => (queryParams == null ? void 0 : queryParams.filters.filter((filter) => filter.id !== column.id && filter.col === column.id).map((filter) => ({ ...filter }))) || [],
+    () => {
+      var _a;
+      return ((_a = queryParams == null ? void 0 : queryParams.filters) == null ? void 0 : _a.filter((filter) => filter.id !== column.id && filter.col === column.id).map((filter) => ({ ...filter }))) || [];
+    },
     [queryParams, column.id]
   );
   return /* @__PURE__ */ jsx(Center, { onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ jsx(
@@ -43,7 +45,10 @@ const HeaderAdvancedFiltersMenuButton = ({ filters, mrtProps }) => {
           table,
           filters,
           filterIconWrapperProps: {
-            label: table.options.localization.advancedFilters ?? t("Advanced Filters"),
+            label: (
+              // #MUSTASSERT `advancedFilters` is a fastapi-rtk custom localization key not present on the upstream `MRT_Localization` type.
+              table.options.localization.advancedFilters ?? t("Advanced Filters")
+            ),
             position: "top",
             withArrow: false,
             openDelay: 1e3

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

@@ -1,12 +1,15 @@
 import { jsx } from "react/jsx-runtime";
 import { Tooltip, Highlight } from "@mantine/core";
-function MultiLineHighlight({ highlight, truncate, tooltipProps, highlightProps, children }) {
+function MultiLineHighlight(props) {
+  const { highlight, truncate, tooltipProps, highlightProps, children } = props;
+  const truncateArray = truncate;
+  const truncateEntry = truncate;
   return Array.isArray(children) ? children.map(
     (c, index) => {
       var _a;
-      return ((_a = truncate == null ? void 0 : truncate[index]) == null ? void 0 : _a.truncated) ? /* @__PURE__ */ jsx(Tooltip, { label: truncate[index].original, ...tooltipProps, children: /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: truncate[index].truncated }, index) }, index) : /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: c }, index);
+      return ((_a = truncateArray == null ? void 0 : truncateArray[index]) == null ? void 0 : _a.truncated) ? /* @__PURE__ */ jsx(Tooltip, { label: truncateArray[index].original, ...tooltipProps, children: /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: truncateArray[index].truncated }, index) }, index) : /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: c }, index);
     }
-  ) : (truncate == null ? void 0 : truncate.truncated) ? /* @__PURE__ */ jsx(Tooltip, { label: truncate.original, ...tooltipProps, children: /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: truncate.truncated }) }) : /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children });
+  ) : (truncateEntry == null ? void 0 : truncateEntry.truncated) ? /* @__PURE__ */ jsx(Tooltip, { label: truncateEntry.original, ...tooltipProps, children: /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: truncateEntry.truncated }) }) : /* @__PURE__ */ jsx(Highlight, { highlight, ...highlightProps, children: children ?? "" });
 }
 export {
   MultiLineHighlight

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

@@ -3,24 +3,25 @@ import { mergeProps, parseFromValuesOrFunc, getValue } from "fastapi-rtk/utils";
 import { Flex } from "@mantine/core";
 import { useMap } from "@mantine/hooks";
 import { useEffect, useMemo } from "react";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import { fromFilterToFilterFn } from "../../utils.mjs";
 import { MemoCell, Cell } from "./Cell.mjs";
 import { MemoColumnHeaderFilter, ColumnHeaderFilter } from "./ColumnHeaderFilter.mjs";
 import { HeaderAdvancedFiltersMenuButton } from "./HeaderAdvancedFiltersMenuButton.mjs";
-function useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters, memo) {
+function useColumns(columnProps = {}, header = {}, body = {}, textFilterSeparator, enableAdvancedFilters, memo) {
   const { info, queryParams, data, specialKey } = useApi();
   const api = useApi();
   const auth = useAuth();
+  const infoPath = info == null ? void 0 : info.path;
   const idValueMap = useMap();
   useEffect(() => {
     Object.entries((info == null ? void 0 : info.filters) || {}).forEach(([key, value]) => {
       for (const filter of value.schema.values || []) {
-        idValueMap.set(`${info == null ? void 0 : info.path}-${key}-${filter.id}`, filter.value);
+        idValueMap.set(`${infoPath}-${key}-${filter.id}`, filter.value);
       }
     });
-  }, [idValueMap, info == null ? void 0 : info.filters, info == null ? void 0 : info.path]);
+  }, [idValueMap, info == null ? void 0 : info.filters, infoPath]);
   const columns = useMemo(
     () => (data == null ? void 0 : data.list_columns.map((col) => {
       var _a, _b, _c, _d, _e, _f, _g;
@@ -51,7 +52,8 @@ function useColumns(columnProps, header, body, textFilterSeparator, enableAdvanc
         Header: enableAdvancedFilters ? (props) => {
           var _a2, _b2;
           return /* @__PURE__ */ jsxs(Flex, { gap: "2px", style: { placeItems: "center" }, children: [
-            ((_a2 = mergeProps(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) ?? // #MUSTASSERT `mergeProps` deep-merges the column-def overrides into a free-form bag; read the optional `header` off it
+            ((_b2 = data == null ? void 0 : data.label_columns) == null ? void 0 : _b2[col]),
             /* @__PURE__ */ jsx(HeaderAdvancedFiltersMenuButton, { filters, mrtProps: props })
           ] });
         } : void 0,

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

@@ -21,7 +21,10 @@ const getBasicInput = (opr, schema) => {
         case "Integer":
           return ({ componentProps }) => /* @__PURE__ */ jsx(HeaderTagsNumberInput, { ...componentProps });
         case "Enum":
-          return ({ componentProps }) => /* @__PURE__ */ jsx(HeaderTagsNumberInput, { data: schema.values, ...componentProps });
+          return ({ componentProps }) => (
+            // #MUSTASSERT an Enum schema's `values` is a scalar list rendered as Mantine `ComboboxData`.
+            /* @__PURE__ */ jsx(HeaderTagsNumberInput, { data: schema.values, ...componentProps })
+          );
       }
       return ({ componentProps }) => /* @__PURE__ */ jsx(HeaderTagsInput, { ...componentProps });
     case "bw":
@@ -68,7 +71,10 @@ const getBasicInput = (opr, schema) => {
     case "Integer":
       return ({ componentProps }) => /* @__PURE__ */ jsx(HeaderNumberInput, { ...componentProps });
     case "Enum":
-      return ({ componentProps }) => /* @__PURE__ */ jsx(HeaderSelectInput, { data: schema.values, ...componentProps });
+      return ({ componentProps }) => (
+        // #MUSTASSERT an Enum schema's `values` is a scalar list rendered as Mantine `ComboboxData`.
+        /* @__PURE__ */ jsx(HeaderSelectInput, { data: schema.values, ...componentProps })
+      );
     case "Date":
     case "DateTime":
       return ({ componentProps }) => /* @__PURE__ */ jsx(HeaderDateInput, { ...componentProps });

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

@@ -1,4 +1,4 @@
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 function useData() {
   const { info, data, loading, dataLoading } = useApi();
   return {

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

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { fromFilterToFilterFn } from "../utils.mjs";
 function useFilters() {
   const { info } = useApi();

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

@@ -1,7 +1,7 @@
 import { DEBOUNCE_DELAY } from "fastapi-rtk/constants";
 import { useDebouncedValue, useDidUpdate } from "@mantine/hooks";
 import { useMemo, useState } from "react";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 function useGlobalFilter() {
   const { queryParams, setQueryParams } = useApi();
   const existingGlobalFilter = useMemo(() => queryParams == null ? void 0 : queryParams.global_filter, [queryParams == null ? void 0 : queryParams.global_filter]);
@@ -15,8 +15,8 @@ function useGlobalFilter() {
   useDidUpdate(() => {
     if (debounced) {
       setQueryParams({ page: 0, global_filter: debounced });
-    } else {
-      (queryParams == null ? void 0 : queryParams.global_filter) && setQueryParams({ page: 0, global_filter: void 0 });
+    } else if (queryParams == null ? void 0 : queryParams.global_filter) {
+      setQueryParams({ page: 0, global_filter: void 0 });
     }
   }, [debounced]);
   return {

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

@@ -1,4 +1,4 @@
-import { useLang } from "../../../hooks/lang/useLang.mjs";
+import { useLang } from "fastapi-rtk/contexts";
 const useI18n = () => {
   const { currentMRTLocalization: localization } = useLang();
   return { localization };

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

@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 const useOnLoad = (fetchOnMount) => {
   const { queryParams, refetch } = useApi();
   useEffect(() => {

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

@@ -1,7 +1,7 @@
 import { DEFAULT_PAGE, DEFAULT_PAGE_SIZE_OPTIONS } from "fastapi-rtk/constants";
 import { isTruthy } from "fastapi-rtk/utils";
 import { useMemo, useCallback } from "react";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 function usePagination(hidePagination) {
   var _a, _b;
   const { data, queryParams, setQueryParams } = useApi();

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

@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 const useQueryOnlyVisibleColumns = (table, queryOnlyVisibleColumns) => {
   const { data, setQueryParams } = useApi();
   useEffect(() => {

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

@@ -12,6 +12,7 @@ function useSize(withBorder) {
   }, [withBorder]);
   const mantineTopToolbarProps = useMemo(() => ({ ref: topToolbarRef }), [topToolbarRef]);
   const mantineBottomToolbarProps = useMemo(
+    // #MUSTASSERT the element-size ref callback is cast to `Ref<HTMLElement>` so the emitted declaration does not surface React's internal `UNDEFINED_VOID_ONLY` ref-callback type.
     () => ({ ref: bottomToolbarRef, pos: "sticky", bottom: 0 }),
     [bottomToolbarRef]
   );

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

@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from "react";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 function useSorting() {
   const { queryParams, setQueryParams, data } = useApi();
   const sorting = useMemo(
@@ -11,14 +11,16 @@ function useSorting() {
       const newSorting = func(sorting);
       if (!newSorting.length) {
         setQueryParams({
+          // #MUSTASSERT #MUSTANY runtime clears the sort by passing `null`; `APIQueryParams` types these fields as `string | undefined`.
           order_column: null,
+          // #MUSTASSERT #MUSTANY runtime clears the sort by passing `null`; `APIQueryParams` types these fields as `string | undefined`.
           order_direction: null
         });
         return;
       }
       const sortObj = newSorting[0];
       setQueryParams({
-        order_column: data.order_columns.includes(sortObj.id) ? sortObj.id : `${sortObj.id}.id`,
+        order_column: (data == null ? void 0 : data.order_columns.includes(sortObj.id)) ? sortObj.id : `${sortObj.id}.id`,
         order_direction: sortObj.desc ? "desc" : "asc"
       });
     },

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useToolbar/basicToolbars.mjs

@@ -4,12 +4,14 @@ import { Download } from "../../../../ActionIcons/Download/Download.mjs";
 import { Refresh } from "../../../../ActionIcons/Refresh/Refresh.mjs";
 import { ToggleFullScreenButton, ToggleDensePaddingButton, ShowHideColumnsButton, ToggleFiltersButton, ToggleGlobalFilterButton } from "./mrtToolbars.mjs";
 function getBasicToolbars(table, rules) {
+  const localization = table.options.localization;
   const toolbars = {
+    // #MUSTANNOTATE index-signature on BasicToolbars required for string-keyed delete in Object.entries loop
     toggleGlobalFilter: (props) => /* @__PURE__ */ jsx(ToggleGlobalFilterButton, { table, ...props }, "basic-toggleGlobalFilter"),
     filter: (props) => /* @__PURE__ */ jsx(ToggleFiltersButton, { table, ...props }, "basic-filter"),
-    refresh: (props) => /* @__PURE__ */ jsx(Refresh, { tooltipProps: { label: table.options.localization.refresh }, ...props }, "basic-refresh"),
-    add: (props) => /* @__PURE__ */ jsx(Add, { tooltipProps: { label: table.options.localization.add }, ...props }, "basic-add"),
-    download: (props) => /* @__PURE__ */ jsx(Download, { tooltipProps: { label: table.options.localization.download }, ...props }, "basic-download"),
+    refresh: (props) => /* @__PURE__ */ jsx(Refresh, { tooltipProps: { label: localization.refresh }, ...props }, "basic-refresh"),
+    add: (props) => /* @__PURE__ */ jsx(Add, { tooltipProps: { label: localization.add }, ...props }, "basic-add"),
+    download: (props) => /* @__PURE__ */ jsx(Download, { tooltipProps: { label: localization.download }, ...props }, "basic-download"),
     // upload: (props) => (
     //   <Upload key="basic-upload" tooltipProps={{ label: table.options.localization.upload }} {...props} />
     // ), //! Disabled until further notice

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useToolbar/mrtToolbars.mjs

@@ -1,11 +1,12 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useActionIcon } from "fastapi-rtk/hooks";
 import { Menu, Tooltip, ActionIcon } from "@mantine/core";
-import { MRT_ShowHideColumnsMenu } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.mjs";
+import { MRT_ShowHideColumnsMenu } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.mjs";
 import { useState } from "react";
 import { BaseActionIcon } from "../../../../ActionIcons/utils/BaseActionIcon.mjs";
 const DENSITY_NEXT = { md: "xs", xl: "md", xs: "xl" };
-const ToggleGlobalFilterButton = ({ table, ...props }) => {
+const ToggleGlobalFilterButton = (props) => {
+  const { table, ...rest } = props;
   const { globalFilter, showGlobalFilter } = table.getState();
   const { IconSearch, IconSearchOff } = table.options.icons;
   return /* @__PURE__ */ jsx(
@@ -21,12 +22,13 @@ const ToggleGlobalFilterButton = ({ table, ...props }) => {
           return (_a = table.refs.searchInputRef.current) == null ? void 0 : _a.focus();
         }, 100);
       },
-      ...props
+      ...rest
     }
   );
 };
 ToggleGlobalFilterButton.displayName = "ToggleGlobalFilterButton";
-const ToggleFiltersButton = ({ table, ...props }) => {
+const ToggleFiltersButton = (props) => {
+  const { table, ...rest } = props;
   const { showColumnFilters } = table.getState();
   const { IconFilter, IconFilterOff } = table.options.icons;
   return /* @__PURE__ */ jsx(
@@ -35,12 +37,13 @@ const ToggleFiltersButton = ({ table, ...props }) => {
       Icon: showColumnFilters ? IconFilterOff : IconFilter,
       label: table.options.localization.showHideFilters,
       onClick: () => table.setShowColumnFilters((current) => !current),
-      ...props
+      ...rest
     }
   );
 };
 ToggleFiltersButton.displayName = "ToggleFiltersButton";
-const ToggleDensePaddingButton = ({ table, ...props }) => {
+const ToggleDensePaddingButton = (props) => {
+  const { table, ...rest } = props;
   const { density } = table.getState();
   const { IconBaselineDensityLarge, IconBaselineDensityMedium, IconBaselineDensitySmall } = table.options.icons;
   const Icon = density === "xs" ? IconBaselineDensitySmall : density === "md" ? IconBaselineDensityMedium : IconBaselineDensityLarge;
@@ -50,12 +53,13 @@ const ToggleDensePaddingButton = ({ table, ...props }) => {
       Icon,
       label: table.options.localization.toggleDensity,
       onClick: () => table.setDensity((current) => DENSITY_NEXT[current]),
-      ...props
+      ...rest
     }
   );
 };
 ToggleDensePaddingButton.displayName = "ToggleDensePaddingButton";
-const ToggleFullScreenButton = ({ table, tooltipProps, ...props }) => {
+const ToggleFullScreenButton = (props) => {
+  const { table, tooltipProps, ...rest } = props;
   const { isFullScreen } = table.getState();
   const { IconMaximize, IconMinimize } = table.options.icons;
   const [tooltipOpened, setTooltipOpened] = useState(false);
@@ -72,15 +76,16 @@ const ToggleFullScreenButton = ({ table, tooltipProps, ...props }) => {
       },
       onMouseEnter: () => setTooltipOpened(true),
       onMouseLeave: () => setTooltipOpened(false),
-      ...props
+      ...rest
     }
   );
 };
 ToggleFullScreenButton.displayName = "ToggleFullScreenButton";
-const ShowHideColumnsButton = ({ table, tooltipProps, iconProps, ...props }) => {
+const ShowHideColumnsButton = (props) => {
+  const { table, tooltipProps, iconProps, ...rest } = props;
   const { IconColumns } = table.options.icons;
   const label = table.options.localization.showHideColumns;
-  const actionIconProps = useActionIcon(props);
+  const actionIconProps = useActionIcon(rest);
   return /* @__PURE__ */ jsxs(Menu, { closeOnItemClick: false, withinPortal: true, children: [
     /* @__PURE__ */ jsx(Tooltip, { withinPortal: true, ...tooltipProps, label: (tooltipProps == null ? void 0 : tooltipProps.label) ?? label, children: /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(ActionIcon, { "aria-label": label, ...actionIconProps, children: /* @__PURE__ */ jsx(IconColumns, { ...iconProps }) }) }) }),
     /* @__PURE__ */ jsx(MRT_ShowHideColumnsMenu, { table })

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

@@ -2,29 +2,30 @@ import { jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { SegmentedControl, Group, Box, Flex } from "@mantine/core";
 import { useMemo, useCallback, isValidElement } from "react";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import { FallbackWrapper } from "../../FallbackWrapper.mjs";
 import { getBasicToolbars } from "./basicToolbars.mjs";
-const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isCustomizerObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && !isValidElement(value);
 function renderCustomizedToolbars(customizer, basicToolbarsObj, functionProps, custom) {
   Object.entries(customizer || {}).forEach(([key, value]) => {
     if (key in basicToolbarsObj) {
-      const isPlainObject = isObject(value) && !isValidElement(value);
-      const props = isPlainObject ? value == null ? void 0 : value.props : void 0;
-      const component = isPlainObject ? value == null ? void 0 : value.component : value;
-      const ToolbarComponent = basicToolbarsObj[key];
-      basicToolbarsObj[key] = () => /* @__PURE__ */ jsx(FallbackWrapper, { fallback: ToolbarComponent(props), functionProps, children: component }, `custom-${key}`);
+      const toolbarKey = key;
+      const isPlainObject = isCustomizerObject(value);
+      const props = isPlainObject ? value.props : void 0;
+      const component = isPlainObject ? value.component : value;
+      const ToolbarComponent = basicToolbarsObj[toolbarKey];
+      basicToolbarsObj[toolbarKey] = () => /* @__PURE__ */ jsx(FallbackWrapper, { fallback: ToolbarComponent(props), functionProps, children: component }, `custom-${key}`);
     }
   });
   let toolbars = Object.values(basicToolbarsObj).map((Component) => Component());
   Object.entries(custom || {}).forEach(([key, value]) => {
-    key = Number(key) - 1;
-    const Component = /* @__PURE__ */ jsx(FallbackWrapper, { functionProps, children: value }, `order-${key}`);
-    if (key > toolbars.length) {
+    const index = Number(key) - 1;
+    const Component = /* @__PURE__ */ jsx(FallbackWrapper, { functionProps, children: value }, `order-${index}`);
+    if (index > toolbars.length) {
       toolbars.push(Component);
     } else {
-      toolbars = [...toolbars.slice(0, key), Component, ...toolbars.slice(key)];
+      toolbars = [...toolbars.slice(0, index), Component, ...toolbars.slice(index)];
     }
   });
   return /* @__PURE__ */ jsx(Flex, { gap: "0.125rem", align: "center", children: toolbars });
@@ -54,10 +55,12 @@ function useToolbar(toolbar = {}, quickFilters, quickFiltersComponent, hideToolb
         data
       } : void 0
     };
+    const quickFiltersFnProps = functionProps;
     if (!data.length) {
-      return parseFromValuesOrFunc(quickFiltersComponent, functionProps) ?? null;
+      return parseFromValuesOrFunc(quickFiltersComponent, quickFiltersFnProps) ?? null;
     }
-    return parseFromValuesOrFunc(quickFiltersComponent, functionProps) ?? /* @__PURE__ */ jsx(SegmentedControl, { ...functionProps.componentProps });
+    return parseFromValuesOrFunc(quickFiltersComponent, quickFiltersFnProps) ?? // #MUSTASSERT #MUSTANY the quick-filters `componentProps` carries the `value` / `onChange` / `data` the `SegmentedControl` needs, but the optional union here is not statically `SegmentedControlProps`.
+    /* @__PURE__ */ jsx(SegmentedControl, { ...functionProps.componentProps });
   }, [queryParams == null ? void 0 : queryParams.filters, data, setQueryParams]);
   const renderToolbarInternalActions = useCallback(
     ({ table }) => {

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useToolbarAlertBanner/FASTAPI_RTK_ToolbarAlertBanner.mjs

@@ -2,9 +2,10 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc, getValueOrDefault } from "fastapi-rtk/utils";
 import { Flex, Group, Stack } from "@mantine/core";
 import { clsx } from "../../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.mjs";
-import { MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.mjs";
+import { MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.mjs";
 import classes from "./FASTAPI_RTK_ToolbarAlertBanner.module.css.mjs";
-const FASTAPI_RTK_ToolbarAlertBanner = ({ groupedAlert, selectedAlert, table, alertBanner, ...rest }) => {
+const FASTAPI_RTK_ToolbarAlertBanner = (props) => {
+  const { groupedAlert, selectedAlert, table, alertBanner, ...rest } = props;
   const {
     getState,
     options: { enableRowSelection, enableSelectAll, mantineToolbarAlertBannerProps, positionToolbarAlertBanner }

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

@@ -2,12 +2,13 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc, RenderWrapper } from "fastapi-rtk/utils";
 import { Box, LoadingOverlay } from "@mantine/core";
 import { clsx } from "../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.mjs";
-import { MRT_EditRowModal } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.mjs";
+import { MRT_EditRowModal } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.mjs";
 import { useState, useLayoutEffect, useEffect } from "react";
 import classes from "./MRT_TableContainer.module.css.mjs";
 import { MRT_Table } from "./table/MRT_Table.mjs";
 const useIsomorphicLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
-const MRT_TableContainer = ({ table, ...rest }) => {
+const MRT_TableContainer = (props) => {
+  const { table, ...rest } = props;
   const {
     getState,
     options: {
@@ -15,11 +16,11 @@ const MRT_TableContainer = ({ table, ...rest }) => {
       editDisplayMode,
       enableStickyHeader,
       mantineLoadingOverlayProps,
-      mantineTableContainerProps,
-      mantineTableContainerWrapperProps
+      mantineTableContainerProps
     },
     refs: { bottomToolbarRef, tableContainerRef, topToolbarRef }
   } = table;
+  const mantineTableContainerWrapperProps = table.options.mantineTableContainerWrapperProps;
   const { creatingRow, editingRow, isFullScreen, isLoading, showLoadingOverlay } = getState();
   const [totalToolbarHeight, setTotalToolbarHeight] = useState(0);
   const tableContainerProps = {

package/dist/core/esm/Tables/NextGenDataGrid/patch/MRT_TableContainer.module.css.mjs

@@ -1,8 +1,8 @@
-const root = "_root_1krki_1";
+const root = "_root_g42rq_1";
 const classes = {
   root,
-  "root-sticky": "_root-sticky_1krki_8",
-  "root-fullscreen": "_root-fullscreen_1krki_16"
+  "root-sticky": "_root-sticky_g42rq_8",
+  "root-fullscreen": "_root-fullscreen_g42rq_12"
 };
 export {
   classes as default,

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

@@ -6,7 +6,8 @@ import { MRT_TableContainer } from "./MRT_TableContainer.mjs";
 import classes from "./MRT_TablePaper.module.css.mjs";
 import { MRT_BottomToolbar } from "./toolbar/MRT_BottomToolbar.mjs";
 import { MRT_TopToolbar } from "./toolbar/MRT_TopToolbar.mjs";
-const MRT_TablePaper = ({ table, ...rest }) => {
+const MRT_TablePaper = (props) => {
+  const { table, ...rest } = props;
   const {
     getState,
     options: { enableBottomToolbar, enableTopToolbar, mantinePaperProps, renderBottomToolbar, renderTopToolbar },

package/dist/core/esm/Tables/NextGenDataGrid/patch/MRT_TablePaper.module.css.mjs

@@ -1,4 +1,4 @@
-const root = "_root_r40yr_84";
+const root = "_root_1c8ag_49";
 const classes = {
   root
 };

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

@@ -1,7 +1,10 @@
 import { jsx } from "react/jsx-runtime";
-import { useMantineReactTable } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.mjs";
+import { useMantineReactTable } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.mjs";
 import { MRT_TablePaper } from "./MRT_TablePaper.mjs";
-const isTableInstanceProp = (props) => props.table !== void 0;
+const isTableInstanceProp = (props) => (
+  // #MUSTASSERT narrow the XOR union to probe the `table` discriminant; the union type does not expose it directly.
+  props.table !== void 0
+);
 const MantineReactTable = (props) => {
   let table;
   if (isTableInstanceProp(props)) {

package/dist/core/esm/Tables/NextGenDataGrid/patch/body/MRT_TableBody.mjs

@@ -4,10 +4,11 @@ import classes from "./MRT_TableBody.module.css.mjs";
 import { memo, useMemo } from "react";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { TableTbody } from "@mantine/core";
-import { useMRT_Rows, useMRT_RowVirtualizer, MRT_TableBodyEmptyRow } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.mjs";
+import { useMRT_Rows, useMRT_RowVirtualizer, MRT_TableBodyEmptyRow } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.mjs";
 import { Memo_MRT_TableBodyRow, MRT_TableBodyRow } from "./MRT_TableBodyRow.mjs";
-const MRT_TableBody = ({ columnVirtualizer, table, tableProps, ...rest }) => {
+const MRT_TableBody = (props) => {
   var _a, _b;
+  const { columnVirtualizer, table, tableProps, ...rest } = props;
   const {
     getBottomRows,
     getIsSomeRowsPinned,
@@ -34,7 +35,9 @@ const MRT_TableBody = ({ columnVirtualizer, table, tableProps, ...rest }) => {
   const tableFooterHeight = enableStickyFooter && ((_b = tableFooterRef.current) == null ? void 0 : _b.clientHeight) || 0;
   const pinnedRowIds = useMemo(() => {
     var _a2, _b2;
-    if (!((_a2 = rowPinning.bottom) == null ? void 0 : _a2.length) && !((_b2 = rowPinning.top) == null ? void 0 : _b2.length)) return [];
+    if (!((_a2 = rowPinning.bottom) == null ? void 0 : _a2.length) && !((_b2 = rowPinning.top) == null ? void 0 : _b2.length)) {
+      return [];
+    }
     return getRowModel().rows.filter((row) => row.getIsPinned()).map((r) => r.id);
   }, [rowPinning, getRowModel().rows]);
   const rows = useMRT_Rows(table);
@@ -98,16 +101,17 @@ const MRT_TableBody = ({ columnVirtualizer, table, tableProps, ...rest }) => {
             }
           }
           const row = rowVirtualizer ? rows[renderedRowIndex] : rowOrVirtualRow;
-          const props = {
+          const props2 = {
             ...commonRowProps,
             pinnedRowIds,
             renderedRowIndex,
             row,
             rowVirtualizer,
+            // #MUSTASSERT when virtualized the mapped item is the virtual row (matches upstream).
             virtualRow: rowVirtualizer ? rowOrVirtualRow : void 0
           };
           const key = `${row.id}-${row.index}`;
-          return memoMode === "rows" ? /* @__PURE__ */ jsx(Memo_MRT_TableBodyRow, { ...props }, key) : /* @__PURE__ */ jsx(MRT_TableBodyRow, { ...props }, key);
+          return memoMode === "rows" ? /* @__PURE__ */ jsx(Memo_MRT_TableBodyRow, { ...props2 }, key) : /* @__PURE__ */ jsx(MRT_TableBodyRow, { ...props2 }, key);
         }) }))
       }
     ),
@@ -125,12 +129,12 @@ const MRT_TableBody = ({ columnVirtualizer, table, tableProps, ...rest }) => {
           tableBodyProps == null ? void 0 : tableBodyProps.className
         ),
         children: getBottomRows().map((row, renderedRowIndex) => {
-          const props = {
+          const props2 = {
             ...commonRowProps,
             renderedRowIndex,
             row
           };
-          return memoMode === "rows" ? /* @__PURE__ */ jsx(Memo_MRT_TableBodyRow, { ...props }, row.id) : /* @__PURE__ */ jsx(MRT_TableBodyRow, { ...props }, row.id);
+          return memoMode === "rows" ? /* @__PURE__ */ jsx(Memo_MRT_TableBodyRow, { ...props2 }, row.id) : /* @__PURE__ */ jsx(MRT_TableBodyRow, { ...props2 }, row.id);
         })
       }
     )