mig-schema-table 3.0.58 → 3.0.60

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

@@ -4,6 +4,7 @@ import { t } from "../../../inc/string";
 import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_TIME_FORMAT, } from "../../../inc/constant";
 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 value = columnFilterValue;
@@ -66,12 +67,11 @@ const FilterFormComponent = ({ columnFilterValue, onChange, onInputKeyDown, prop
                                                     onChange(undefined);
                                                     return;
                                                 }
-                                                if (dateRangeValue.from &&
-                                                    date &&
-                                                    date < dateRangeValue.from) {
+                                                const to = date ? endOfDay(date) : undefined;
+                                                if (dateRangeValue.from && to && to < dateRangeValue.from) {
                                                     return;
                                                 }
-                                                onChange(Object.assign(Object.assign({}, columnFilterValue), { to: date || undefined }));
+                                                onChange(Object.assign(Object.assign({}, columnFilterValue), { to }));
                                             }, placeholderText: dateFormat, isClearable: true, startDate: dateRangeValue.from, endDate: dateRangeValue.to, showTimeSelect: format === "date-time", timeIntervals: 15, shouldCloseOnSelect: format === "date" })] }))] }))] }));
             }
         // falls through

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]

package/package.json

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