mig-schema-table 3.0.57 → 3.0.59

package/dist/SchemaTable/index.js

@@ -9,6 +9,20 @@ import Td from "./Td";
 import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_TIME_FORMAT } from "../inc/constant";
 import SchemaColumnFilterPopover from "./SchemaColumnFilterPopover";
 const startOfTheWorldDate = new Date("1000-01-01 00:00:00Z");
+function getSortByValue(propSchema, propConfig) {
+    var _a;
+    if ((propConfig === null || propConfig === void 0 ? void 0 : propConfig.sortByValue) !== undefined) {
+        return propConfig === null || propConfig === void 0 ? void 0 : propConfig.sortByValue;
+    }
+    if (!propSchema) {
+        return false;
+    }
+    const isDate = propSchema && ((_a = propSchema.format) === null || _a === void 0 ? void 0 : _a.startsWith("date"));
+    return (isDate ||
+        propSchema.type === "boolean" ||
+        propSchema.type === "integer" ||
+        !!(propConfig === null || propConfig === void 0 ? void 0 : propConfig.renderCell));
+}
 function SchemaTable({ Heading = VariableSizeList, checkedIndexes, disabledCheckedIndexes, config, customElement, data, defaultColumnFilters = {}, defaultSortAsc = false, defaultSortColumn, getRowClassName, getRowSelected, maxHeight, isSearchable, isColumnFilterable, isSortable, onCheckedIndexesChange, onRowClick, rowHeight = 36, schema, searchPlaceholder, style, width, onRowDoubleClick, enableAutoFocus, }) {
     const [sortColumn, setSortColumn] = React.useState(defaultSortColumn);
     const [sortAsc, setSortAsc] = React.useState(defaultSortAsc);
@@ -254,6 +268,7 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, disabledCheck
     ]);
     // Sort the filtered data
     const sortedRenderData = React.useMemo(() => {
+        var _a;
         if (!sortColumn || !filteredRenderData || !sourceData || isDataFunction) {
             return filteredRenderData;
         }
@@ -273,16 +288,9 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, disabledCheck
                 return columnSort(aData, bData, sortAsc);
             });
         }
+        const isDate = sortSchema && ((_a = sortSchema.format) === null || _a === void 0 ? void 0 : _a.startsWith("date"));
+        const sortByValue = getSortByValue(sortSchema, propConfig);
         return filteredRenderData.sort((a, b) => {
-            var _a;
-            const isDate = sortSchema && ((_a = sortSchema.format) === null || _a === void 0 ? void 0 : _a.startsWith("date"));
-            const sortByValue = (propConfig === null || propConfig === void 0 ? void 0 : propConfig.sortByValue) === undefined
-                ? !sortSchema ||
-                    isDate ||
-                    sortSchema.type === "boolean" ||
-                    sortSchema.type === "integer" ||
-                    (propConfig === null || propConfig === void 0 ? void 0 : propConfig.renderCell)
-                : propConfig.sortByValue;
             let x = sortByValue && sourceData[a._index]
                 ? // @ts-ignore
                     sourceData[a._index][sortColumn]
@@ -353,17 +361,17 @@ function SchemaTable({ Heading = VariableSizeList, checkedIndexes, disabledCheck
     }, [isDataFunction]);
     const SchemaTableTh = React.useCallback(({ style, index }) => {
         const propName = columnNames[index];
+        const propSchema = (propName === SELECT_ALL_COLUMN_NAME
+            ? { type: "boolean" }
+            : properties[propName]);
         const propConfig = config ? config[propName] : undefined;
-        let columnFilterStatus = isColumnFilterable && propConfig && propConfig.isFilterable !== false
+        let columnFilterStatus = isColumnFilterable && propSchema && (propConfig === null || propConfig === void 0 ? void 0 : propConfig.isFilterable) !== false
             ? EColumnFilterStatus.AVAILABLE
             : EColumnFilterStatus.UNAVAILABLE;
         if (columnFilterMap[propName] !== undefined) {
             columnFilterStatus = EColumnFilterStatus.ACTIVE;
         }
-        const schema = (propName === SELECT_ALL_COLUMN_NAME
-            ? { type: "boolean" }
-            : properties[propName]);
-        return (_jsx(Th, { isAllChecked: isAllRowsChecked, columnFilterStatus: columnFilterStatus, disableColumnFilter: disableColumnFilter, isSortable: !!isSortable, numberOfSelectedRows: checkedIndexes === null || checkedIndexes === void 0 ? void 0 : checkedIndexes.length, onSelectAllIndexesHandler: onSelectAllIndexesHandler, propConfig: propConfig, propIsRequired: required.includes(propName), propName: propName, schema: schema, setPopoverConfig: setPopoverConfig, setSortAsc: onSetSortAsc, setSortColumn: onSetSortColumn, sortAsc: sortColumn === propName ? sortAsc : undefined, style: style }));
+        return (_jsx(Th, { isAllChecked: isAllRowsChecked, columnFilterStatus: columnFilterStatus, disableColumnFilter: disableColumnFilter, isSortable: !!isSortable, numberOfSelectedRows: checkedIndexes === null || checkedIndexes === void 0 ? void 0 : checkedIndexes.length, onSelectAllIndexesHandler: onSelectAllIndexesHandler, propConfig: propConfig, propIsRequired: required.includes(propName), propName: propName, schema: propSchema, setPopoverConfig: setPopoverConfig, setSortAsc: onSetSortAsc, setSortColumn: onSetSortColumn, sortAsc: sortColumn === propName ? sortAsc : undefined, style: style }));
     }, [
         checkedIndexes === null || checkedIndexes === void 0 ? void 0 : checkedIndexes.length,
         columnFilterMap,

package/package.json

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