mig-schema-table 3.0.101 → 3.0.103

package/dist/SchemaTable/index.js

@@ -46,6 +46,7 @@ function getSortByValue(propSchema, propConfig) {
 }
 function getIsColumnSortable(isTableSortable, propSchema, propConfig) {
     return !!(isTableSortable &&
+        (propConfig === null || propConfig === void 0 ? void 0 : propConfig.isSortable) !== false &&
         (propSchema || (propConfig === null || propConfig === void 0 ? void 0 : propConfig.renderData) || (propConfig === null || propConfig === void 0 ? void 0 : propConfig.sort)));
 }
 function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, customElement, data, defaultColumnFilters = {}, defaultSortAsc = false, defaultSortColumn, disabledCheckedIndexes, enableAutoFocus = true, enableRowCounter = true, getRowClassName, getRowSelected, isColumnFilterable = true, isExportable = true, isResizable = true, isSearchable = true, isSortable = true, maxHeight, onCheckedIndexesChange, onRowClick, onRowDoubleClick, onSearchEnter, rowHeight = 36, schema, searchPlaceholder, style, translate = defaultTranslate, useFilterStateHash, width, }) {
@@ -55,9 +56,9 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
     const isDataFunction = data instanceof Function;
     const [sourceData, setSourceData] = React.useState(isDataFunction ? undefined : data);
     const [columnWidths, setColumnWidths] = React.useState();
-    const [locationHash, setLocationHash] = React.useState(useFilterStateHash ? parseLocationHash(window.location.hash) : {});
-    const [searchQuery, setSearchQuery] = React.useState(locationHash.searchQuery || "");
-    const [columnFilterMap, setColumnFilterMap] = React.useState(locationHash.columnFilterMap || defaultColumnFilters);
+    const [locationHash, setLocationHash] = React.useState(useFilterStateHash ? parseLocationHash(window.location.hash) : null);
+    const [searchQuery, setSearchQuery] = React.useState((locationHash === null || locationHash === void 0 ? void 0 : locationHash.searchQuery) || "");
+    const [columnFilterMap, setColumnFilterMap] = React.useState((locationHash === null || locationHash === void 0 ? void 0 : locationHash.columnFilterMap) || defaultColumnFilters);
     const [isDirty, setIsDirty] = React.useState(false);
     React.useEffect(() => {
         if (isDataFunction) {
@@ -312,6 +313,10 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
                     // fall through
                     default:
                         // fallback by looking at the render value
+                        if (propSchema === null || propSchema === void 0 ? void 0 : propSchema.enum) {
+                            result = rawValue === columnFilterValue;
+                            return;
+                        }
                         result = `${item[propName]}`
                             .toLowerCase()
                             .includes(`${columnFilterValue}`.toLowerCase());
@@ -538,9 +543,9 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
         if (!useFilterStateHash) {
             return;
         }
-        setColumnFilterMap(locationHash.columnFilterMap || {});
-        setSearchQuery(locationHash.searchQuery || "");
-    }, [locationHash, useFilterStateHash]);
+        setColumnFilterMap((locationHash === null || locationHash === void 0 ? void 0 : locationHash.columnFilterMap) || defaultColumnFilters);
+        setSearchQuery((locationHash === null || locationHash === void 0 ? void 0 : locationHash.searchQuery) || "");
+    }, [locationHash, useFilterStateHash, defaultColumnFilters]);
     const onSchemaColumnFilterChange = React.useCallback((newColumnFilterValue, persistState) => {
         if (!thMenuConfig) {
             return;
@@ -574,10 +579,11 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, config, custo
         setSearchQuery("");
     }, [useFilterStateHash]);
     const onSearchBlur = React.useCallback(() => {
+        const oldSearchQuery = (locationHash === null || locationHash === void 0 ? void 0 : locationHash.searchQuery) || "";
         if (useFilterStateHash &&
             // prevent hash change for undefined vs empty string compare
-            (searchQuery || locationHash.searchQuery) &&
-            searchQuery !== locationHash.searchQuery) {
+            (searchQuery || oldSearchQuery) &&
+            searchQuery !== oldSearchQuery) {
             window.location.hash = serializeLocationHash(Object.assign(Object.assign({}, locationHash), { searchQuery }));
         }
     }, [locationHash, searchQuery, useFilterStateHash]);

package/dist/inc/data.d.ts

@@ -1,2 +1,2 @@
-export declare const parseLocationHash: <T extends {}>(search: string) => T;
+export declare const parseLocationHash: <T extends {}>(search: string) => T | null;
 export declare const serializeLocationHash: (params: {}) => string;

package/dist/inc/data.js

@@ -12,7 +12,7 @@ const unserializeDates = (serializedObject) => {
 };
 export const parseLocationHash = (search) => {
     if (!search.length) {
-        return {};
+        return null;
     }
     const result = {};
     search

package/dist/types.d.ts

@@ -16,7 +16,7 @@ export interface IColumnConfig<T> {
     showTimezones?: false;
     sort?: (a: T, b: T, sortAsc: boolean) => number;
     sortByValue?: boolean;
-    sortable?: boolean;
+    isSortable?: boolean;
     title?: string | React.ReactElement;
     width?: number;
 }

package/package.json

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