mig-schema-table 3.0.61 → 3.0.62

package/dist/SchemaTable/SchemaColumnFilterPopover/FilterFormComponent/index.d.ts

@@ -9,7 +9,7 @@ export interface IFilterFormComponentProps {
     propConfig?: IColumnConfig<any>;
     propIsRequired: boolean;
     propName: string;
-    propSchema: oas31.SchemaObject;
+    propSchema?: oas31.SchemaObject;
 }
 declare const _default: React.MemoExoticComponent<({ columnFilterValue, onChange, onInputKeyDown, propConfig, propIsRequired, propName, propSchema, }: IFilterFormComponentProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/dist/SchemaTable/SchemaColumnFilterPopover/FilterFormComponent/index.js

@@ -6,7 +6,7 @@ import DatePicker from "react-datepicker";
 import nl from "date-fns/locale/nl";
 import { endOfDay } from "date-fns";
 const FilterFormComponent = ({ columnFilterValue, onChange, onInputKeyDown, propConfig, propIsRequired, propName, propSchema, }) => {
-    const { type, format, minimum, maximum } = propSchema;
+    const { type, format, minimum, maximum } = propSchema || {};
     const value = columnFilterValue;
     switch (type) {
         case "integer":
@@ -34,7 +34,7 @@ const FilterFormComponent = ({ columnFilterValue, onChange, onInputKeyDown, prop
                 } }, { children: [_jsx("option", Object.assign({ value: "" }, { children: "All" }), "all"), ["✓", "✕"].map((optionValue) => (_jsx("option", Object.assign({ value: optionValue }, { children: optionValue }), `column-filter-select-${optionValue}`)))] })));
         // @ts-ignore
         case "string":
-            if (propSchema.enum) {
+            if (propSchema === null || propSchema === void 0 ? void 0 : propSchema.enum) {
                 return (_jsxs("select", Object.assign({ autoFocus: true, className: "form-select", value: value, "data-prop-name": propName, onChange: (e) => {
                         onChange(e.currentTarget.value || undefined);
                     } }, { children: [_jsx("option", Object.assign({ value: "" }, { children: "All" }), "all"), propSchema.enum.map((name) => {

package/dist/SchemaTable/index.js

@@ -221,6 +221,11 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
                 if (!result || columnFilterValue === undefined) {
                     return;
                 }
+                const propConfig = config ? config[propName] : undefined;
+                if (sourceData && (propConfig === null || propConfig === void 0 ? void 0 : propConfig.filter)) {
+                    result = propConfig.filter(sourceData[item._index], item._index);
+                    return;
+                }
                 const propSchema = properties[propName];
                 // @ts-ignore
                 const rawValue = sourceData[item._index][propName];
@@ -265,8 +270,9 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
         searchQuery,
         columnNames,
         columnFilterMap,
-        properties,
+        config,
         sourceData,
+        properties,
     ]);
     // Sort the filtered data
     const sortedRenderData = React.useMemo(() => {
@@ -367,7 +373,9 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
             ? { type: "boolean" }
             : properties[propName]);
         const propConfig = config ? config[propName] : undefined;
-        let columnFilterStatus = isColumnFilterable && propSchema && (propConfig === null || propConfig === void 0 ? void 0 : propConfig.isFilterable) !== false
+        let columnFilterStatus = isColumnFilterable &&
+            (propSchema || (propConfig === null || propConfig === void 0 ? void 0 : propConfig.FilterForm)) &&
+            (propConfig === null || propConfig === void 0 ? void 0 : propConfig.isFilterable) !== false
             ? EColumnFilterStatus.AVAILABLE
             : EColumnFilterStatus.UNAVAILABLE;
         if (columnFilterMap[propName] !== undefined) {

package/dist/types.d.ts

@@ -1,10 +1,11 @@
 import React from "react";
 import { IFilterFormComponentProps } from "./SchemaTable/SchemaColumnFilterPopover/FilterFormComponent";
 export interface IColumnConfig<T> {
+    FilterForm?: (props: IFilterFormComponentProps) => React.ReactElement | null;
     align?: "start" | "center" | "end";
     dateFormat?: string;
     defaultSortDesc?: boolean;
-    FilterForm?: (props: IFilterFormComponentProps) => React.ReactElement | null;
+    filter?: (rowData: T, dataIndex: number) => boolean;
     hidden?: boolean;
     hoverTitle?: string;
     isFilterable?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mig-schema-table",
-  "version": "3.0.61",
+  "version": "3.0.62",
   "main": "dist/index.js",
   "files": [
     "dist/"