fastapi-rtk 2.1.5 → 2.2.0

package/dist/core/cjs/Tables/DataGrid/Toolbar/Filter/FormFilterIn.cjs

@@ -3,16 +3,19 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const core = require("@mantine/core");
-function FormFilterIn({ form, name, label, comboboxProps, ...props }) {
+function FormFilterIn(props) {
+  const { form, name, label, comboboxProps } = props;
   const combobox = core.useCombobox({
     onDropdownClose: () => combobox.resetSelectedOption(),
     onDropdownOpen: () => combobox.updateSelectedOptionIndex("active")
   });
   const [value, setValue] = React.useState([]);
   const [search, setSearch] = React.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/cjs/Tables/DataGrid/Toolbar/Filter/FormOperatorField.cjs

@@ -1,16 +1,8 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
-function FormFilterField({ form, name, items, onChange, ...props }) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    core.Select,
-    {
-      data: items,
-      searchable: true,
-      ...form.getInputProps(name),
-      onChange,
-      ...props
-    }
-  );
+function FormFilterField(props) {
+  const { form, name, items, onChange, ...rest } = props;
+  return /* @__PURE__ */ jsxRuntime.jsx(core.Select, { data: items, searchable: true, ...form.getInputProps(name), onChange, ...rest });
 }
 module.exports = FormFilterField;

package/dist/core/cjs/Tables/DataGrid/Toolbar/Toolbar.cjs

@@ -5,17 +5,15 @@ const core = require("@mantine/core");
 const React = require("react");
 const Add = require("../../../ActionIcons/Add/Add.cjs");
 const Download = require("../../../ActionIcons/Download/Download.cjs");
-const useApi = require("../../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const Filter = require("./Filter/Filter.cjs");
-const Toolbar = React.memo(({ hideAdd, hideFilter, hideDownload, toolbarCustomizer }) => {
-  const { info } = useApi.useApi();
+const Toolbar = React.memo((props) => {
+  const { hideAdd, hideFilter, hideDownload, toolbarCustomizer } = props;
+  const { info } = contexts.useApi();
   const customizedToolbar = React.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/cjs/Tables/NextGenDataGrid/FallbackWrapper.cjs

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const utils = require("fastapi-rtk/utils");
 const React = require("react");
-const FallbackWrapper = React.forwardRef(({ fallback, functionProps, children }, ref) => {
-  children = utils.parseFromValuesOrFunc(children, functionProps);
-  if (children === null) {
+const FallbackWrapper = React.forwardRef((props, ref) => {
+  const { fallback, functionProps, children } = props;
+  const resolvedChildren = utils.parseFromValuesOrFunc(children, functionProps);
+  if (resolvedChildren === null) {
     return null;
   }
-  const result = children || fallback;
+  const result = resolvedChildren || fallback;
   return React.isValidElement(result) ? React.cloneElement(result, { ref }) : result;
 });
 FallbackWrapper.displayName = "FallbackWrapper";

package/dist/core/cjs/Tables/NextGenDataGrid/HooksComponent.cjs

@@ -5,17 +5,19 @@ const useOptimizations = require("./hooks/useOptimizations.cjs");
 const useQueryOnlyVisibleColumns = require("./hooks/useQueryOnlyVisibleColumns.cjs");
 const useSelection = require("./hooks/useSelection/useSelection.cjs");
 const useView = require("./hooks/useView.cjs");
-const HooksComponent = ({
-  useOnLoadProps,
-  useViewProps,
-  useTableSelectionProps,
-  useTableOptimizationsProps,
-  useQueryOnlyVisibleColumnsProps
-}) => {
+const HooksComponent = (props) => {
+  const {
+    useOnLoadProps,
+    useViewProps,
+    useTableSelectionProps,
+    useTableOptimizationsProps,
+    useQueryOnlyVisibleColumnsProps
+  } = props;
   useOnLoad.useOnLoad(useOnLoadProps);
   useView.useView(useViewProps);
   useSelection.useTableSelection(...useTableSelectionProps);
   useOptimizations.useTableOptimizations(...useTableOptimizationsProps);
   useQueryOnlyVisibleColumns.useQueryOnlyVisibleColumns(...useQueryOnlyVisibleColumnsProps);
+  return null;
 };
 exports.HooksComponent = HooksComponent;

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

@@ -6,14 +6,14 @@ const jsxRuntime = require("react/jsx-runtime");
 const constants = require("fastapi-rtk/constants");
 const utils = require("fastapi-rtk/utils");
 const core = require("@mantine/core");
-const index_esm = require("../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.cjs");
+const index_esm = require("../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.cjs");
 const React = require("react");
 const AddDialog = require("../../Dialogs/AddDialog.cjs");
 const DeleteDialog = require("../../Dialogs/DeleteDialog.cjs");
 const EditDialog = require("../../Dialogs/EditDialog.cjs");
 const ViewDialog = require("../../Dialogs/ViewDialog.cjs");
 const LazyLoadWrapper = require("../../Wrappers/LazyLoadWrapper/LazyLoadWrapper.cjs");
-const useApi = require("../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const ErrorDialog = require("../DataGrid/ErrorDialog.cjs");
 const HooksComponent = require("./HooksComponent.cjs");
 const zustand = require("./components/OptimizedMRT_RowSelectColumn/zustand.cjs");
@@ -36,7 +36,7 @@ const baseProps = { enableStickyHeader: true, enableColumnPinning: true };
 const defaultProps = { optimizations: { loading: true, selectionSyncDelay: constants.DEBOUNCE_DELAY } };
 const NextGenDataGrid = React.forwardRef((props, ref) => {
   var _a, _b, _c, _d;
-  const { info, specialKey } = useApi.useApi();
+  const { info, specialKey } = contexts.useApi();
   const propsFromMantineTheme = core.useProps("NextGenDataGrid", {}, {});
   const {
     children,
@@ -59,7 +59,7 @@ const NextGenDataGrid = React.forwardRef((props, ref) => {
     body,
     form,
     toolbar = {},
-    //! Temporary add {} until we remove deprecated props
+    //! Temporary {} default until deprecated props are removed
     textFilterSeparator = ";",
     enableAdvancedFilters,
     wrapperProps,
@@ -77,28 +77,30 @@ const NextGenDataGrid = React.forwardRef((props, ref) => {
     hideFilter,
     ...rest
   } = React.useMemo(() => utils.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) {
@@ -150,7 +152,7 @@ const NextGenDataGrid = React.forwardRef((props, ref) => {
   const paginationProps = usePagination.usePagination(hidePagination);
   const columnsProps = useColumns.useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters, memo);
   const sizeProps = useSize.useSize(withBorder);
-  const actionsConfig = React.useMemo(() => utils.mergeProps(body, specialKey.actions), [body, specialKey]);
+  const actionsConfig = React.useMemo(() => utils.mergeProps(body ?? {}, specialKey.actions), [body, specialKey]);
   const actionsProps = useActions.useActions(
     hideActions,
     actionsConfig == null ? void 0 : actionsConfig.component,
@@ -182,6 +184,7 @@ const NextGenDataGrid = React.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 utils.deepMerge(result, utils.parseFromValuesOrFunc(table, result));
   }, [
@@ -204,13 +207,18 @@ const NextGenDataGrid = React.forwardRef((props, ref) => {
   ]);
   const tableOptions = index_esm.useMRT_TableOptions(_mrtProps);
   const optimizationsProps = useOptimizations.useOptimizations(tableOptions, _mrtProps.columns, optimizations);
-  const mrtProps = React.useMemo(() => utils.deepMerge(_mrtProps, optimizationsProps), [_mrtProps, optimizationsProps]);
+  const mrtProps = React.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.
+    () => utils.deepMerge(_mrtProps, optimizationsProps),
+    [_mrtProps, optimizationsProps]
+  );
   const mrtTable = index_esm.useMantineReactTable(mrtProps);
-  mrtTable.refs.selectionStoreRef = React.useRef(zustand.selectionStoreFactory());
-  mrtTable.refs.optionsRef = React.useRef(tableOptions);
-  mrtTable.refs.optionsRef.current = tableOptions;
-  mrtTable.refs.optimizationsRef = React.useRef(optimizations);
-  mrtTable.refs.optimizationsRef.current = optimizations;
+  const refs = mrtTable.refs;
+  refs.selectionStoreRef = React.useRef(zustand.selectionStoreFactory());
+  refs.optionsRef = React.useRef(tableOptions);
+  refs.optionsRef.current = tableOptions;
+  refs.optimizationsRef = React.useRef(optimizations);
+  refs.optimizationsRef.current = optimizations;
   const useOnLoadProps = React.useMemo(() => fetchOnMount, [fetchOnMount]);
   const useViewProps = React.useMemo(() => form, [form]);
   const useTableSelectionProps = React.useMemo(
@@ -223,12 +231,18 @@ const NextGenDataGrid = React.forwardRef((props, ref) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [onSelectCheckbox, bulkActions, optimizations]
   );
-  const useQueryOnlyVisibleColumnsProps = React.useMemo(() => [mrtTable, queryOnlyVisibleColumns], [queryOnlyVisibleColumns]);
+  const useQueryOnlyVisibleColumnsProps = React.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__ */ jsxRuntime.jsxs(core.Box, { pos: "relative", h: "100%", w: "100%", mih: 0, flex: 1, ...wrapperProps, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(LazyLoadWrapper.LazyLoadWrapper, { cond: !!info, children: [
       /* @__PURE__ */ jsxRuntime.jsx(ViewDialog.ViewDialog, { ...(_a = form == null ? void 0 : form.view) == null ? void 0 : _a.dialogProps }),
-      /* @__PURE__ */ jsxRuntime.jsx(AddDialog.AddDialog, { jsonForms: form == null ? void 0 : form.add, ...(_b = form == null ? void 0 : form.add) == null ? void 0 : _b.dialogProps }),
-      /* @__PURE__ */ jsxRuntime.jsx(EditDialog.EditDialog, { jsonForms: form == null ? void 0 : form.edit, ...(_c = form == null ? void 0 : form.edit) == null ? void 0 : _c.dialogProps }),
+      /* @__PURE__ */ jsxRuntime.jsx(AddDialog.AddDialog, { jsonForms: addJsonForms, ...(_b = form == null ? void 0 : form.add) == null ? void 0 : _b.dialogProps }),
+      /* @__PURE__ */ jsxRuntime.jsx(EditDialog.EditDialog, { jsonForms: editJsonForms, ...(_c = form == null ? void 0 : form.edit) == null ? void 0 : _c.dialogProps }),
       /* @__PURE__ */ jsxRuntime.jsx(DeleteDialog.DeleteDialog, { ...(_d = form == null ? void 0 : form.delete) == null ? void 0 : _d.dialogProps })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsx(

package/dist/core/cjs/Tables/NextGenDataGrid/components/OptimizedMRT_RowSelectColumn/getOptimizedMRT_RowSelectColumnDef.cjs

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const utils = require("fastapi-rtk/utils");
-const index_esm = require("../../../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_patch_hash_046f1b0f764b8dc88804170e4ca8f096de0796df0be_2e8cfd91765713166f4d486da3b54b13/mantine-react-table/dist/index.esm.cjs");
+const index_esm = require("../../../../../../.external/cjs/mantine-react-table@2.0.0-beta.9_patch_hash_b9fcaf5fc0698f1949127d6bfb1f154a5bd28d0d1fe_7b4bd73d03bc0c4b3e9706b344be0f5a/mantine-react-table/dist/index.esm.cjs");
 const React = require("react");
 const zustand = require("./zustand.cjs");
-const Cell = ({ renderedRowIndex, row, table }) => {
+const Cell = (props) => {
+  const { renderedRowIndex, row, table } = props;
   const store = table.refs.selectionStoreRef.current;
   const rowId = React.useMemo(() => row.id, [row.id]);
   const checked = zustand.useSelectionStore(store, (state) => state.rowSelection[rowId] ?? false);
@@ -18,10 +19,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 }
@@ -38,7 +40,8 @@ const Cell = ({ renderedRowIndex, row, table }) => {
     }
   );
 };
-const Header = ({ table }) => {
+const Header = (props) => {
+  const { table } = props;
   const store = table.refs.selectionStoreRef.current;
   const checked = zustand.useSelectionStore(store, (state) => state.getIsAllRowsSelected(table));
   const indeterminate = zustand.useSelectionStore(
@@ -63,8 +66,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/cjs/Tables/NextGenDataGrid/hooks/useActions.cjs

@@ -4,11 +4,11 @@ const jsxRuntime = require("react/jsx-runtime");
 const utils = require("fastapi-rtk/utils");
 const React = require("react");
 const Actions = require("../../../ActionIcons/Actions.cjs");
-const useApi = require("../../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const useAuth = require("../../../hooks/auth/useAuth.cjs");
 const FallbackWrapper = require("../FallbackWrapper.cjs");
 function useActions(hideActions, component, viewProps, editProps, deleteProps) {
-  const api = useApi.useApi();
+  const api = contexts.useApi();
   const auth = useAuth.useAuth();
   const renderRowActions = React.useCallback(
     ({ row, ...rest }) => /* @__PURE__ */ jsxRuntime.jsx(

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

@@ -6,12 +6,13 @@ const core = require("@mantine/core");
 const form = require("@mantine/form");
 const hooks = require("@mantine/hooks");
 const React = require("react");
-const useApi = require("../../../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const FormField = require("../../../DataGrid/FormField/FormField.cjs");
 const FormFilterIn = require("../../../DataGrid/Toolbar/Filter/FormFilterIn.cjs");
 const AdvancedFiltersMenu = require("./AdvancedFiltersMenu.cjs");
-function AdvancedFilters({ col }) {
-  const { info, queryParams, setQueryParams } = useApi.useApi();
+function AdvancedFilters(props) {
+  const { col } = props;
+  const { info, queryParams, setQueryParams } = contexts.useApi();
   const form$1 = form.useForm({
     initialValues: {
       filters: (queryParams == null ? void 0 : queryParams.filters) || []
@@ -21,7 +22,10 @@ function AdvancedFilters({ col }) {
   const filterNameMap = React.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]
   );
@@ -55,17 +59,17 @@ function AdvancedFilters({ col }) {
         {
           form: form$1,
           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__ */ jsxRuntime.jsx(core.Grid.Col, { span: 12, py: 0, children: /* @__PURE__ */ jsxRuntime.jsx(core.Divider, { my: "sm", label: "AND", align: "center" }) })
+      index >= 0 && index + 1 < formFilters.length && /* @__PURE__ */ jsxRuntime.jsx(core.Grid.Col, { span: 12, py: 0, children: /* @__PURE__ */ jsxRuntime.jsx(core.Divider, { my: "sm", label: "AND", ...{ align: "center" } }) })
     ] }, `${filter.col}-${index}`) : null
   ).filter(Boolean);
   return /* @__PURE__ */ jsxRuntime.jsxs(core.Grid, { w: fields.length ? "25rem" : "100%", gap: "xs", children: [
-    fields.length ? fields : /* @__PURE__ */ jsxRuntime.jsx(core.Grid.Col, { span: 12, children: /* @__PURE__ */ jsxRuntime.jsx(core.Text, { align: "center", c: "gray", style: { fontStyle: "italic" }, children: "No filters" }) }),
+    fields.length ? fields : /* @__PURE__ */ jsxRuntime.jsx(core.Grid.Col, { span: 12, children: /* @__PURE__ */ jsxRuntime.jsx(core.Text, { ...{ align: "center" }, c: "gray", style: { fontStyle: "italic" }, children: "No filters" }) }),
     /* @__PURE__ */ jsxRuntime.jsx(core.Grid.Col, { span: 12, children: /* @__PURE__ */ jsxRuntime.jsx(core.Stack, { children: /* @__PURE__ */ jsxRuntime.jsx(
       AdvancedFiltersMenu.AdvancedFiltersMenu,
       {

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

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
-function AdvancedFiltersMenu({ col, colFilter, onClick, ...props }) {
-  return /* @__PURE__ */ jsxRuntime.jsxs(core.Menu, { shadow: "md", width: "target", ...props, children: [
+function AdvancedFiltersMenu(props) {
+  var _a;
+  const { col, colFilter, onClick, ...rest } = props;
+  return /* @__PURE__ */ jsxRuntime.jsxs(core.Menu, { shadow: "md", width: "target", ...rest, children: [
     /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Target, { children: /* @__PURE__ */ jsxRuntime.jsx(core.Button, { children: "Add filter" }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Dropdown, { children: colFilter.filters.filter((filter) => !filter.id).map((filter) => /* @__PURE__ */ jsxRuntime.jsx(
+    /* @__PURE__ */ jsxRuntime.jsx(core.Menu.Dropdown, { children: (_a = colFilter.filters) == null ? void 0 : _a.filter((filter) => !filter.id).map((filter) => /* @__PURE__ */ jsxRuntime.jsx(
       core.Menu.Item,
       {
         onClick: () => onClick({ col, opr: filter.operator, value: "" }),

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
 const utils = require("../../utils.cjs");
-function BasicFilters({ filters, col, opr, table }) {
+function BasicFilters(props) {
+  const { filters, col, opr, table } = props;
   const theme = core.useMantineTheme();
   return filters.map((filter) => {
     const checked = filter.operator === opr;

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

@@ -3,15 +3,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const utils = require("fastapi-rtk/utils");
 const React = require("react");
-const useApi = require("../../../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const useAuth = require("../../../../hooks/auth/useAuth.cjs");
 const FallbackWrapper = require("../../FallbackWrapper.cjs");
 const MultiLineHighlight = require("./MultiLineHighlight.cjs");
-const Cell = ({ body, col, textFilterSeparator, mrtProps }) => {
+const Cell = (props) => {
+  const { body = {}, col, textFilterSeparator, mrtProps } = props;
   const { table, column, cell } = mrtProps;
-  const api = useApi.useApi();
+  const api = contexts.useApi();
   const auth = useAuth.useAuth();
-  const { specialKey } = useApi.useApi();
+  const { specialKey } = contexts.useApi();
   const colProps = utils.mergeProps(body, specialKey.all, col);
   const { component, separator, truncate, highlight: _highlight, tooltipProps, highlightProps } = colProps;
   let functionProps = { api, auth, data: cell.row.original, colProps, mrtProps };
@@ -20,7 +21,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()));
@@ -32,7 +35,12 @@ const Cell = ({ body, col, textFilterSeparator, mrtProps }) => {
     return highlights2;
   }, [column.getFilterValue(), table.getState().globalFilter, textFilterSeparator, _highlight]);
   const cellObj = React.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/cjs/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilter.cjs

@@ -3,43 +3,44 @@ 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 contexts = require("fastapi-rtk/contexts");
 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,
-  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.useApi();
+  const api = contexts.useApi();
   const auth = useAuth.useAuth();
   const functionProps = React.useMemo(() => ({ api, auth, mrtProps }), [api, auth, mrtProps]);
   const _filterFn = ((_a = table.getState().columnFilterFns) == null ? void 0 : _a[column.id]) || filterFn;
   const opr = React.useMemo(() => utils.fromFilterFnToFilter(_filterFn).operator, [_filterFn]);
   const actionIconProps = React.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__ */ jsxRuntime.jsxs(core.Stack, { w: "100%", gap: "0.25rem", children: [
     /* @__PURE__ */ jsxRuntime.jsxs(core.Flex, { align: "flex-end", children: [