fastapi-rtk 2.1.5 → 2.2.0

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

@@ -2,9 +2,10 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { useProps, Popover, Tooltip, Indicator, ActionIcon, Box, CloseButton } from "@mantine/core";
 import { useState } from "react";
 import ForwardRef from "../../../../_virtual/filter.mjs";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { FilterMenu } from "./FilterMenu.mjs";
 function Filter(...props) {
+  var _a;
   const { queryParams } = useApi();
   const defaultProps = {
     bg: "transparent",
@@ -14,7 +15,7 @@ function Filter(...props) {
   const icon = useProps("ActionIcon", defaultProps, props);
   const [opened, setOpened] = useState(false);
   return /* @__PURE__ */ jsxs(Popover, { opened, position: "bottom-end", onClose: () => setOpened(false), closeOnClickOutside: false, children: [
-    /* @__PURE__ */ jsx(Popover.Target, { children: /* @__PURE__ */ jsx(Tooltip, { opened: opened ? false : null, label: "Filter", children: (queryParams == null ? void 0 : queryParams.filters.filter((f) => !f.id).length) != 0 ? /* @__PURE__ */ jsx(Indicator, { zIndex: 20, size: 16, label: queryParams == null ? void 0 : queryParams.filters.length, children: /* @__PURE__ */ jsx(ActionIcon, { bg: icon.bg, size: icon.size, c: icon.c, onClick: () => setOpened(true), children: /* @__PURE__ */ jsx(ForwardRef, {}) }) }) : /* @__PURE__ */ jsx(ActionIcon, { bg: icon.bg, size: icon.size, c: icon.c, onClick: () => setOpened(true), children: /* @__PURE__ */ jsx(ForwardRef, {}) }) }) }),
+    /* @__PURE__ */ jsx(Popover.Target, { children: /* @__PURE__ */ jsx(Tooltip, { opened: opened ? false : void 0, label: "Filter", children: ((_a = queryParams == null ? void 0 : queryParams.filters) == null ? void 0 : _a.filter((f) => !f.id).length) != 0 ? /* @__PURE__ */ jsx(Indicator, { zIndex: 20, size: 16, label: queryParams == null ? void 0 : queryParams.filters.length, children: /* @__PURE__ */ jsx(ActionIcon, { bg: icon.bg, size: icon.size, c: icon.c, onClick: () => setOpened(true), children: /* @__PURE__ */ jsx(ForwardRef, {}) }) }) : /* @__PURE__ */ jsx(ActionIcon, { bg: icon.bg, size: icon.size, c: icon.c, onClick: () => setOpened(true), children: /* @__PURE__ */ jsx(ForwardRef, {}) }) }) }),
     /* @__PURE__ */ jsxs(Popover.Dropdown, { px: "xs", children: [
       /* @__PURE__ */ jsx(Box, { style: { position: "absolute", top: 4, right: 4 }, children: /* @__PURE__ */ jsx(CloseButton, { title: "Filters", onClick: () => setOpened(false) }) }),
       /* @__PURE__ */ jsx(

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

@@ -7,12 +7,13 @@ 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.7.1/yup/index.esm.mjs";
 import ForwardRef$1 from "../../../../_virtual/plus.mjs";
 import ForwardRef from "../../../../_virtual/trash.mjs";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { FormField } from "../../FormField/FormField.mjs";
 import FormFilterField from "./FormFilterField.mjs";
 import { FormFilterIn } from "./FormFilterIn.mjs";
 import FormFilterField$1 from "./FormOperatorField.mjs";
-function FilterMenu({ onClose, ...props }) {
+function FilterMenu(props) {
+  const { onClose, ...rest } = props;
   const { info, queryParams, setQueryParams, path } = useApi();
   const form = useForm({
     initialValues: {
@@ -36,13 +37,14 @@ function FilterMenu({ onClose, ...props }) {
         )
       })
     )
+    // #MUSTASSERT #MUSTUNKNOWN `yupResolver` returns a validator typed over `Record<string, unknown>`; bridge through `unknown` to the form's `FilterMenuFormValues` shape
   });
   const defaultProps = {
     bg: "transparent",
     size: "sm",
     c: "gray"
   };
-  const icon = useProps("ActionIcon", defaultProps, props);
+  const icon = useProps("ActionIcon", defaultProps, rest);
   useEffect(() => {
     form.setValues({ filters: [] });
     form.reset();
@@ -57,7 +59,7 @@ function FilterMenu({ onClose, ...props }) {
     }
   }, [queryParams.filters]);
   const handleSubmit = (data) => {
-    const filtersWithoutKey = data.filters.map(({ key, ...rest }) => rest);
+    const filtersWithoutKey = data.filters.map(({ key, ...rest2 }) => rest2);
     const filters = JSON.parse(JSON.stringify(filtersWithoutKey));
     setQueryParams({ filters, page: 0 });
     onClose();
@@ -74,7 +76,7 @@ function FilterMenu({ onClose, ...props }) {
             value: String(property)
           })),
           onChange: (newValue) => {
-            form.setFieldValue(`filters.${index}`, { col: newValue, opr: "", value: "", key: randomId() });
+            form.setFieldValue(`filters.${index}`, { col: newValue ?? "", opr: "", value: "", key: randomId() });
           }
         }
       ) }),
@@ -88,9 +90,10 @@ function FilterMenu({ onClose, ...props }) {
             value: value.operator
           })),
           onChange: (newValue) => {
+            var _a;
             form.setFieldValue(`filters.${index}`, {
-              col: form.values.filters[index].col,
-              opr: newValue,
+              col: ((_a = form.values.filters[index]) == null ? void 0 : _a.col) ?? "",
+              opr: newValue ?? "",
               value: "",
               key: randomId()
             });
@@ -129,7 +132,7 @@ function FilterMenu({ onClose, ...props }) {
           children: "Add Filter"
         }
       ),
-      /* @__PURE__ */ jsx(Group, { spacing: "md", children: /* @__PURE__ */ jsx(Button, { type: "submit", children: "Apply" }) })
+      /* @__PURE__ */ jsx(Group, { gap: "md", children: /* @__PURE__ */ jsx(Button, { type: "submit", children: "Apply" }) })
     ] })
   ] });
 }

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

@@ -1,16 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { Select } from "@mantine/core";
-function FormFilterField({ form, name, items, onChange, ...props }) {
-  return /* @__PURE__ */ jsx(
-    Select,
-    {
-      data: items,
-      searchable: true,
-      ...form.getInputProps(name),
-      onChange,
-      ...props
-    }
-  );
+function FormFilterField(props) {
+  const { form, name, items, onChange, ...rest } = props;
+  return /* @__PURE__ */ jsx(Select, { data: items, searchable: true, ...form.getInputProps(name), onChange, ...rest });
 }
 export {
   FormFilterField as default

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

@@ -1,16 +1,19 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
 import { useCombobox, Pill, InputWrapper, Combobox, PillsInput } from "@mantine/core";
-function FormFilterIn({ form, name, label, comboboxProps, ...props }) {
+function FormFilterIn(props) {
+  const { form, name, label, comboboxProps } = props;
   const combobox = useCombobox({
     onDropdownClose: () => combobox.resetSelectedOption(),
     onDropdownOpen: () => combobox.updateSelectedOptionIndex("active")
   });
   const [value, setValue] = useState([]);
   const [search, setSearch] = useState("");
-  const handleValueSelect = (val) => {
+  const handleValueSelect = () => {
     if (search !== "") {
-      if (!value.includes(search)) setValue((current) => [...current, search]);
+      if (!value.includes(search)) {
+        setValue((current) => [...current, search]);
+      }
       setSearch("");
     }
   };

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

@@ -1,16 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { Select } from "@mantine/core";
-function FormFilterField({ form, name, items, onChange, ...props }) {
-  return /* @__PURE__ */ jsx(
-    Select,
-    {
-      data: items,
-      searchable: true,
-      ...form.getInputProps(name),
-      onChange,
-      ...props
-    }
-  );
+function FormFilterField(props) {
+  const { form, name, items, onChange, ...rest } = props;
+  return /* @__PURE__ */ jsx(Select, { data: items, searchable: true, ...form.getInputProps(name), onChange, ...rest });
 }
 export {
   FormFilterField as default

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

@@ -3,17 +3,15 @@ import { Flex } from "@mantine/core";
 import { memo, useMemo } from "react";
 import { Add } from "../../../ActionIcons/Add/Add.mjs";
 import { Download } from "../../../ActionIcons/Download/Download.mjs";
-import { useApi } from "../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { Filter } from "./Filter/Filter.mjs";
-const Toolbar = memo(({ hideAdd, hideFilter, hideDownload, toolbarCustomizer }) => {
+const Toolbar = memo((props) => {
+  const { hideAdd, hideFilter, hideDownload, toolbarCustomizer } = props;
   const { info } = useApi();
   const customizedToolbar = useMemo(() => {
     const toolbar = {};
     Object.entries(toolbarCustomizer).forEach(([key, value]) => {
-      toolbar[key] = value;
-      if (typeof toolbar[key] === "function") {
-        toolbar[key] = toolbar[key]();
-      }
+      toolbar[key] = typeof value === "function" ? value() : value;
     });
     return toolbar;
   }, [toolbarCustomizer]);

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

@@ -1,11 +1,12 @@
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { forwardRef, isValidElement, cloneElement } from "react";
-const FallbackWrapper = forwardRef(({ fallback, functionProps, children }, ref) => {
-  children = parseFromValuesOrFunc(children, functionProps);
-  if (children === null) {
+const FallbackWrapper = forwardRef((props, ref) => {
+  const { fallback, functionProps, children } = props;
+  const resolvedChildren = parseFromValuesOrFunc(children, functionProps);
+  if (resolvedChildren === null) {
     return null;
   }
-  const result = children || fallback;
+  const result = resolvedChildren || fallback;
   return isValidElement(result) ? cloneElement(result, { ref }) : result;
 });
 FallbackWrapper.displayName = "FallbackWrapper";

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

@@ -3,18 +3,20 @@ import { useTableOptimizations } from "./hooks/useOptimizations.mjs";
 import { useQueryOnlyVisibleColumns } from "./hooks/useQueryOnlyVisibleColumns.mjs";
 import { useTableSelection } from "./hooks/useSelection/useSelection.mjs";
 import { useView } from "./hooks/useView.mjs";
-const HooksComponent = ({
-  useOnLoadProps,
-  useViewProps,
-  useTableSelectionProps,
-  useTableOptimizationsProps,
-  useQueryOnlyVisibleColumnsProps
-}) => {
+const HooksComponent = (props) => {
+  const {
+    useOnLoadProps,
+    useViewProps,
+    useTableSelectionProps,
+    useTableOptimizationsProps,
+    useQueryOnlyVisibleColumnsProps
+  } = props;
   useOnLoad(useOnLoadProps);
   useView(useViewProps);
   useTableSelection(...useTableSelectionProps);
   useTableOptimizations(...useTableOptimizationsProps);
   useQueryOnlyVisibleColumns(...useQueryOnlyVisibleColumnsProps);
+  return null;
 };
 export {
   HooksComponent

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

@@ -4,14 +4,14 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { DEBOUNCE_DELAY } from "fastapi-rtk/constants";
 import { deepMerge, mergeProps, getItemId, parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { useProps, Box } from "@mantine/core";
-import { useMRT_TableOptions, useMantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.mjs";
+import { useMRT_TableOptions, useMantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.mjs";
 import { forwardRef, useMemo, useEffect, useRef } from "react";
 import { AddDialog } from "../../Dialogs/AddDialog.mjs";
 import { DeleteDialog } from "../../Dialogs/DeleteDialog.mjs";
 import { EditDialog } from "../../Dialogs/EditDialog.mjs";
 import { ViewDialog } from "../../Dialogs/ViewDialog.mjs";
 import { LazyLoadWrapper } from "../../Wrappers/LazyLoadWrapper/LazyLoadWrapper.mjs";
-import { useApi } from "../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { ErrorDialog } from "../DataGrid/ErrorDialog.mjs";
 import { HooksComponent } from "./HooksComponent.mjs";
 import { selectionStoreFactory } from "./components/OptimizedMRT_RowSelectColumn/zustand.mjs";
@@ -57,7 +57,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
     body,
     form,
     toolbar = {},
-    //! Temporary add {} until we remove deprecated props
+    //! Temporary {} default until deprecated props are removed
     textFilterSeparator = ";",
     enableAdvancedFilters,
     wrapperProps,
@@ -75,28 +75,30 @@ const NextGenDataGrid = forwardRef((props, ref) => {
     hideFilter,
     ...rest
   } = useMemo(() => deepMerge(defaultProps, propsFromMantineTheme, props), [props, propsFromMantineTheme]);
-  if (bodySeparator) {
+  if (bodySeparator && body) {
     Object.keys(body).forEach((col) => {
-      body[col] = body[col] || {};
-      body[col].separator = body[col].separator || bodySeparator;
+      const entry = body[col] = body[col] || {};
+      entry.separator = entry.separator || bodySeparator;
     });
   }
-  if (bodyTruncate) {
+  if (bodyTruncate && body) {
     Object.keys(body).forEach((col) => {
-      body[col] = body[col] || {};
-      body[col].truncate = body[col].truncate || bodyTruncate;
+      const entry = body[col] = body[col] || {};
+      entry.truncate = entry.truncate || bodyTruncate;
     });
   }
-  if (headerCustomizer) {
+  if (headerCustomizer && header) {
     Object.keys(headerCustomizer).forEach((col) => {
-      header[col] = header[col] || {};
-      header[col].component = headerCustomizer[col].component || headerCustomizer[col];
+      const slot = headerCustomizer[col];
+      const entry = header[col] = header[col] || {};
+      entry.component = slot !== null && typeof slot === "object" && "component" in slot ? slot.component : slot;
     });
   }
-  if (bodyCustomizer) {
+  if (bodyCustomizer && body) {
     Object.keys(bodyCustomizer).forEach((col) => {
-      body[col] = body[col] || {};
-      body[col].component = bodyCustomizer[col].component || bodyCustomizer[col];
+      const slot = bodyCustomizer[col];
+      const entry = body[col] = body[col] || {};
+      entry.component = slot !== null && typeof slot === "object" && "component" in slot ? slot.component : slot;
     });
   }
   if (toolbarCustomizer) {
@@ -148,7 +150,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
   const paginationProps = usePagination(hidePagination);
   const columnsProps = useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters, memo);
   const sizeProps = useSize(withBorder);
-  const actionsConfig = useMemo(() => mergeProps(body, specialKey.actions), [body, specialKey]);
+  const actionsConfig = useMemo(() => mergeProps(body ?? {}, specialKey.actions), [body, specialKey]);
   const actionsProps = useActions(
     hideActions,
     actionsConfig == null ? void 0 : actionsConfig.component,
@@ -180,6 +182,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
       filterProps,
       toolbarAlertBannerProps,
       i18nProps
+      // #MUSTASSERT #MUSTUNKNOWN the runtime object is a valid `MRT_TableOptions`, but TS cannot prove the union of merged partial shapes satisfies it.
     );
     return deepMerge(result, parseFromValuesOrFunc(table, result));
   }, [
@@ -202,13 +205,18 @@ const NextGenDataGrid = forwardRef((props, ref) => {
   ]);
   const tableOptions = useMRT_TableOptions(_mrtProps);
   const optimizationsProps = useOptimizations(tableOptions, _mrtProps.columns, optimizations);
-  const mrtProps = useMemo(() => deepMerge(_mrtProps, optimizationsProps), [_mrtProps, optimizationsProps]);
+  const mrtProps = useMemo(
+    // #MUSTASSERT the optimization overrides merge into the table options; the runtime object is a valid `MRT_TableOptions` but the merged shape is not statically provable.
+    () => deepMerge(_mrtProps, optimizationsProps),
+    [_mrtProps, optimizationsProps]
+  );
   const mrtTable = useMantineReactTable(mrtProps);
-  mrtTable.refs.selectionStoreRef = useRef(selectionStoreFactory());
-  mrtTable.refs.optionsRef = useRef(tableOptions);
-  mrtTable.refs.optionsRef.current = tableOptions;
-  mrtTable.refs.optimizationsRef = useRef(optimizations);
-  mrtTable.refs.optimizationsRef.current = optimizations;
+  const refs = mrtTable.refs;
+  refs.selectionStoreRef = useRef(selectionStoreFactory());
+  refs.optionsRef = useRef(tableOptions);
+  refs.optionsRef.current = tableOptions;
+  refs.optimizationsRef = useRef(optimizations);
+  refs.optimizationsRef.current = optimizations;
   const useOnLoadProps = useMemo(() => fetchOnMount, [fetchOnMount]);
   const useViewProps = useMemo(() => form, [form]);
   const useTableSelectionProps = useMemo(
@@ -221,12 +229,18 @@ const NextGenDataGrid = forwardRef((props, ref) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [onSelectCheckbox, bulkActions, optimizations]
   );
-  const useQueryOnlyVisibleColumnsProps = useMemo(() => [mrtTable, queryOnlyVisibleColumns], [queryOnlyVisibleColumns]);
+  const useQueryOnlyVisibleColumnsProps = useMemo(
+    () => [mrtTable, queryOnlyVisibleColumns],
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [queryOnlyVisibleColumns]
+  );
+  const addJsonForms = form == null ? void 0 : form.add;
+  const editJsonForms = form == null ? void 0 : form.edit;
   return /* @__PURE__ */ jsxs(Box, { pos: "relative", h: "100%", w: "100%", mih: 0, flex: 1, ...wrapperProps, children: [
     /* @__PURE__ */ jsxs(LazyLoadWrapper, { cond: !!info, children: [
       /* @__PURE__ */ jsx(ViewDialog, { ...(_a = form == null ? void 0 : form.view) == null ? void 0 : _a.dialogProps }),
-      /* @__PURE__ */ jsx(AddDialog, { jsonForms: form == null ? void 0 : form.add, ...(_b = form == null ? void 0 : form.add) == null ? void 0 : _b.dialogProps }),
-      /* @__PURE__ */ jsx(EditDialog, { jsonForms: form == null ? void 0 : form.edit, ...(_c = form == null ? void 0 : form.edit) == null ? void 0 : _c.dialogProps }),
+      /* @__PURE__ */ jsx(AddDialog, { jsonForms: addJsonForms, ...(_b = form == null ? void 0 : form.add) == null ? void 0 : _b.dialogProps }),
+      /* @__PURE__ */ jsx(EditDialog, { jsonForms: editJsonForms, ...(_c = form == null ? void 0 : form.edit) == null ? void 0 : _c.dialogProps }),
       /* @__PURE__ */ jsx(DeleteDialog, { ...(_d = form == null ? void 0 : form.delete) == null ? void 0 : _d.dialogProps })
     ] }),
     /* @__PURE__ */ jsx(

package/dist/core/esm/Tables/NextGenDataGrid/components/OptimizedMRT_RowSelectColumn/getOptimizedMRT_RowSelectColumnDef.mjs

@@ -1,9 +1,10 @@
 import { jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
-import { defaultDisplayColumnProps, 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 { defaultDisplayColumnProps, 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 { useMemo } from "react";
 import { useSelectionStore } from "./zustand.mjs";
-const Cell = ({ renderedRowIndex, row, table }) => {
+const Cell = (props) => {
+  const { renderedRowIndex, row, table } = props;
   const store = table.refs.selectionStoreRef.current;
   const rowId = useMemo(() => row.id, [row.id]);
   const checked = useSelectionStore(store, (state) => state.rowSelection[rowId] ?? false);
@@ -16,10 +17,11 @@ const Cell = ({ renderedRowIndex, row, table }) => {
     [storeOnChange, rowId]
   );
   row.getCanSelect = () => {
-    if (typeof table.refs.optionsRef.current.enableRowSelection === "function") {
-      return table.refs.optionsRef.current.enableRowSelection(row);
+    const optionsRef = table.refs.optionsRef;
+    if (typeof optionsRef.current.enableRowSelection === "function") {
+      return optionsRef.current.enableRowSelection(row);
     }
-    return table.refs.optionsRef.current.enableRowSelection ?? true;
+    return optionsRef.current.enableRowSelection ?? true;
   };
   const {
     options: { mantineSelectCheckboxProps }
@@ -36,7 +38,8 @@ const Cell = ({ renderedRowIndex, row, table }) => {
     }
   );
 };
-const Header = ({ table }) => {
+const Header = (props) => {
+  const { table } = props;
   const store = table.refs.selectionStoreRef.current;
   const checked = useSelectionStore(store, (state) => state.getIsAllRowsSelected(table));
   const indeterminate = useSelectionStore(
@@ -61,8 +64,11 @@ const Header = ({ table }) => {
     {
       table,
       checked: (checkboxProps == null ? void 0 : checkboxProps.checked) ?? checked,
-      indeterminate: (checkboxProps == null ? void 0 : checkboxProps.indeterminate) ?? indeterminate,
-      onChange: (checkboxProps == null ? void 0 : checkboxProps.onChange) ?? onChange
+      onChange: (checkboxProps == null ? void 0 : checkboxProps.onChange) ?? onChange,
+      ...{
+        indeterminate: (checkboxProps == null ? void 0 : checkboxProps.indeterminate) ?? indeterminate
+        // #MUSTASSERT #MUSTANY MRT types the select-all prop as Checkbox|Radio|Switch, omitting `indeterminate` the rendered Checkbox branch has
+      }
     }
   );
 };

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

@@ -2,7 +2,7 @@ import { jsx } from "react/jsx-runtime";
 import { getItemId } from "fastapi-rtk/utils";
 import { useCallback } from "react";
 import { Actions } from "../../../ActionIcons/Actions.mjs";
-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";
 function useActions(hideActions, component, viewProps, editProps, deleteProps) {

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

@@ -4,11 +4,12 @@ import { Grid, Center, CloseButton, Divider, Text, Stack } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { useDebouncedValue, useDidUpdate } from "@mantine/hooks";
 import { useMemo, Fragment } from "react";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { FormField } from "../../../DataGrid/FormField/FormField.mjs";
 import { FormFilterIn } from "../../../DataGrid/Toolbar/Filter/FormFilterIn.mjs";
 import { AdvancedFiltersMenu } from "./AdvancedFiltersMenu.mjs";
-function AdvancedFilters({ col }) {
+function AdvancedFilters(props) {
+  const { col } = props;
   const { info, queryParams, setQueryParams } = useApi();
   const form = useForm({
     initialValues: {
@@ -19,7 +20,10 @@ function AdvancedFilters({ col }) {
   const filterNameMap = useMemo(
     () => {
       var _a;
-      return ((_a = colFilter == null ? void 0 : colFilter.filters) == null ? void 0 : _a.reduce((acc, filter) => ({ ...acc, [filter.operator]: filter.name }), {})) || {};
+      return ((_a = colFilter == null ? void 0 : colFilter.filters) == null ? void 0 : _a.reduce(
+        (acc, filter) => ({ ...acc, [filter.operator]: filter.name }),
+        {}
+      )) || {};
     },
     [colFilter == null ? void 0 : colFilter.filters]
   );
@@ -53,17 +57,17 @@ function AdvancedFilters({ col }) {
         {
           form,
           name: `filters.${index}.value`,
-          label: filterNameMap[filter.opr],
           schema: colFilter.schema,
           withinPortal: false,
-          filter: true
+          filter: true,
+          ...{ label: filterNameMap[filter.opr] }
         }
       ) }),
-      index >= 0 && index + 1 < formFilters.length && /* @__PURE__ */ jsx(Grid.Col, { span: 12, py: 0, children: /* @__PURE__ */ jsx(Divider, { my: "sm", label: "AND", align: "center" }) })
+      index >= 0 && index + 1 < formFilters.length && /* @__PURE__ */ jsx(Grid.Col, { span: 12, py: 0, children: /* @__PURE__ */ jsx(Divider, { my: "sm", label: "AND", ...{ align: "center" } }) })
     ] }, `${filter.col}-${index}`) : null
   ).filter(Boolean);
   return /* @__PURE__ */ jsxs(Grid, { w: fields.length ? "25rem" : "100%", gap: "xs", children: [
-    fields.length ? fields : /* @__PURE__ */ jsx(Grid.Col, { span: 12, children: /* @__PURE__ */ jsx(Text, { align: "center", c: "gray", style: { fontStyle: "italic" }, children: "No filters" }) }),
+    fields.length ? fields : /* @__PURE__ */ jsx(Grid.Col, { span: 12, children: /* @__PURE__ */ jsx(Text, { ...{ align: "center" }, c: "gray", style: { fontStyle: "italic" }, children: "No filters" }) }),
     /* @__PURE__ */ jsx(Grid.Col, { span: 12, children: /* @__PURE__ */ jsx(Stack, { children: /* @__PURE__ */ jsx(
       AdvancedFiltersMenu,
       {

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

@@ -1,9 +1,11 @@
 import { jsxs, jsx } from "react/jsx-runtime";
 import { Menu, Button } from "@mantine/core";
-function AdvancedFiltersMenu({ col, colFilter, onClick, ...props }) {
-  return /* @__PURE__ */ jsxs(Menu, { shadow: "md", width: "target", ...props, children: [
+function AdvancedFiltersMenu(props) {
+  var _a;
+  const { col, colFilter, onClick, ...rest } = props;
+  return /* @__PURE__ */ jsxs(Menu, { shadow: "md", width: "target", ...rest, children: [
     /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(Button, { children: "Add filter" }) }),
-    /* @__PURE__ */ jsx(Menu.Dropdown, { children: colFilter.filters.filter((filter) => !filter.id).map((filter) => /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Menu.Dropdown, { children: (_a = colFilter.filters) == null ? void 0 : _a.filter((filter) => !filter.id).map((filter) => /* @__PURE__ */ jsx(
       Menu.Item,
       {
         onClick: () => onClick({ col, opr: filter.operator, value: "" }),

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

@@ -1,7 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { useMantineTheme, Menu, Text } from "@mantine/core";
 import { fromFilterToFilterFn } from "../../utils.mjs";
-function BasicFilters({ filters, col, opr, table }) {
+function BasicFilters(props) {
+  const { filters, col, opr, table } = props;
   const theme = useMantineTheme();
   return filters.map((filter) => {
     const checked = filter.operator === opr;

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

@@ -1,11 +1,12 @@
 import { jsx } from "react/jsx-runtime";
 import { mergeProps, parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { memo, useMemo } 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 { MultiLineHighlight } from "./MultiLineHighlight.mjs";
-const Cell = ({ body, col, textFilterSeparator, mrtProps }) => {
+const Cell = (props) => {
+  const { body = {}, col, textFilterSeparator, mrtProps } = props;
   const { table, column, cell } = mrtProps;
   const api = useApi();
   const auth = useAuth();
@@ -18,7 +19,9 @@ const Cell = ({ body, col, textFilterSeparator, mrtProps }) => {
     const columnTextFilter = column.getFilterValue();
     const highlights2 = [];
     if (globalFilter) {
-      highlights2.push(...globalFilter.split(textFilterSeparator).map((f) => f.trim()));
+      highlights2.push(
+        ...String(globalFilter).split(textFilterSeparator).map((f) => f.trim())
+      );
     }
     if (columnTextFilter && typeof columnTextFilter === "string") {
       highlights2.push(...columnTextFilter.split(textFilterSeparator).map((f) => f.trim()));
@@ -30,7 +33,12 @@ const Cell = ({ body, col, textFilterSeparator, mrtProps }) => {
     return highlights2;
   }, [column.getFilterValue(), table.getState().globalFilter, textFilterSeparator, _highlight]);
   const cellObj = useMemo(() => {
-    const result = { value: cell.getValue(), truncate: {}, highlight: [] };
+    const result = {
+      value: cell.getValue(),
+      // #MUSTASSERT seeded empty; populated with the real `TruncateEntry`(s) below only when truncation applies.
+      truncate: {},
+      highlight: []
+    };
     if (typeof result.value === "number") {
       result.value = String(result.value);
     } else if (result.value === null || result.value === void 0) {

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

@@ -1,29 +1,30 @@
 import { jsxs, jsx } from "react/jsx-runtime";
 import { Stack, Flex } from "@mantine/core";
 import { memo, useMemo } from "react";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import { fromFilterFnToFilter } from "../../utils.mjs";
 import { BasicFilters } from "./BasicFilters.mjs";
 import { ColumnHeaderFilterInput } from "./ColumnHeaderFilterInput/ColumnHeaderFilterInput.mjs";
 import { FilterMenuButton } from "./FilterMenuButton.mjs";
 import { FilterModeDescription } from "./FilterModeDescription.mjs";
-const ColumnHeaderFilter = ({
-  children,
-  enableFilterModes,
-  filters,
-  filterFn,
-  filterProps,
-  filterState,
-  filterSync,
-  filterMenu,
-  filterModeDescription,
-  updateQueryParams,
-  withLocalStorage,
-  localStorageKey,
-  mrtProps
-}) => {
+const ColumnHeaderFilter = (props) => {
   var _a;
+  const {
+    children,
+    enableFilterModes,
+    filters,
+    filterFn,
+    filterProps,
+    filterState,
+    filterSync,
+    filterMenu,
+    filterModeDescription,
+    updateQueryParams,
+    withLocalStorage,
+    localStorageKey,
+    mrtProps
+  } = props;
   const { table, column } = mrtProps;
   const api = useApi();
   const auth = useAuth();
@@ -31,13 +32,13 @@ const ColumnHeaderFilter = ({
   const _filterFn = ((_a = table.getState().columnFilterFns) == null ? void 0 : _a[column.id]) || filterFn;
   const opr = useMemo(() => fromFilterFnToFilter(_filterFn).operator, [_filterFn]);
   const actionIconProps = useMemo(() => {
-    const props = { variant: "subtle" };
+    const props2 = { variant: "subtle" };
     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]);
   return /* @__PURE__ */ jsxs(Stack, { w: "100%", gap: "0.25rem", children: [
     /* @__PURE__ */ jsxs(Flex, { align: "flex-end", children: [