nntc-ui 0.0.46 → 0.0.48

package/index.js

@@ -2735,6 +2735,32 @@ import { useMemo as useMemo5 } from "react";
 var root18 = "headerDropdown_root";
 var checklistWrap = "headerDropdown_checklistWrap";
 
+// src/components/view/VirtualTable/utils/alphanumericCompare.ts
+var alphanumericCompare = (a, b) => {
+  const aParts = a.match(/(\d+|\D+)/g) || [];
+  const bParts = b.match(/(\d+|\D+)/g) || [];
+  const maxLength = Math.max(aParts.length, bParts.length);
+  for (let i = 0; i < maxLength; i++) {
+    const aPart = aParts[i] || "";
+    const bPart = bParts[i] || "";
+    const aIsNumber = /^\d+$/.test(aPart);
+    const bIsNumber = /^\d+$/.test(bPart);
+    if (aIsNumber && bIsNumber) {
+      const numA = parseInt(aPart, 10);
+      const numB = parseInt(bPart, 10);
+      if (numA !== numB) {
+        return numA - numB;
+      }
+    } else {
+      const comparison = aPart.localeCompare(bPart);
+      if (comparison !== 0) {
+        return comparison;
+      }
+    }
+  }
+  return 0;
+};
+
 // src/components/view/VirtualTable/ui/DateFiltration/DateFiltration.tsx
 import classnames19 from "classnames";
 import { useEffect as useEffect7, useState as useState14 } from "react";
@@ -2923,12 +2949,21 @@ function HeaderDropdown(props) {
   } = props;
   const headerResultName = sortAnotherName ?? headerName;
   const filterItems3 = useMemo5(() => {
-    const checklistItems = items2.filter((i) => Object.keys(i).includes(headerResultName)).map(
+    const checklistItems = items2.map(
       (i) => ({
-        name: valueFormat ? valueFormat(i[headerResultName].value?.toString() ?? "") : toFixed !== void 0 && !Number.isNaN(parseFloat(i[headerResultName].value)) ? parseFloat(Number(i[headerResultName].value).toFixed(toFixed)) : i[headerResultName].value,
-        value: i[headerResultName].value
+        name: i[headerResultName] ? valueFormat ? valueFormat(i[headerResultName].value?.toString() ?? "") : toFixed !== void 0 && !Number.isNaN(parseFloat(i[headerResultName].value)) ? parseFloat(Number(i[headerResultName].value).toFixed(toFixed)) : i[headerResultName].value || "< \u043D\u0435\u0442 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F >" : "< \u043D\u0435\u0442 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F >",
+        value: i[headerResultName]?.value || ""
       })
-    );
+    ).sort((a, b) => {
+      const aName = a.name.toString();
+      const bName = b.name.toString();
+      const noValue = "< \u043D\u0435\u0442 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F >";
+      if (aName === noValue)
+        return -1;
+      if (bName === noValue)
+        return 1;
+      return alphanumericCompare(aName, bName);
+    });
     const uniqueChecklistItems = [
       ...checklistItems.reduce((a, c) => {
         a.set(c.value, c);
@@ -3169,39 +3204,13 @@ var recursiveFilter = (rows, filterBy) => {
     const endDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[1]) : null;
     const filtered = filterByItem.values.length ? rows.filter((row) => {
       const dateValue = filterByItem.type === "dateRange" ? dayjs3(row[filterByItem.columnName].value) : null;
-      return row[filterByItem.columnName] && (filterByItem.type === "dateRange" ? (dateValue.isAfter(startDate) || dateValue.isSame(startDate)) && (dateValue.isBefore(endDate) || dateValue.isSame(endDate)) : filterByItem.type === "numberRange" ? row[filterByItem.columnName].value >= filterByItem.values[0] && row[filterByItem.columnName].value <= filterByItem.values[1] : filterByItem.values.includes(row[filterByItem.columnName].value?.toString() ?? "")) || row.isNew?.value === 1;
+      return (row[filterByItem.columnName] ? filterByItem.type === "dateRange" ? (dateValue.isAfter(startDate) || dateValue.isSame(startDate)) && (dateValue.isBefore(endDate) || dateValue.isSame(endDate)) : filterByItem.type === "numberRange" ? row[filterByItem.columnName].value >= filterByItem.values[0] && row[filterByItem.columnName].value <= filterByItem.values[1] : filterByItem.values.includes((row[filterByItem.columnName].value || "")?.toString()) : filterByItem.values.includes("")) || row.isNew?.value === 1;
     }) : rows;
     return recursiveFilter(filtered, filterBy.slice(0, filterBy.length - 1));
   }
   return rows;
 };
 
-// src/components/view/VirtualTable/utils/alphanumericCompare.ts
-var alphanumericCompare = (a, b) => {
-  const aParts = a.match(/(\d+|\D+)/g) || [];
-  const bParts = b.match(/(\d+|\D+)/g) || [];
-  const maxLength = Math.max(aParts.length, bParts.length);
-  for (let i = 0; i < maxLength; i++) {
-    const aPart = aParts[i] || "";
-    const bPart = bParts[i] || "";
-    const aIsNumber = /^\d+$/.test(aPart);
-    const bIsNumber = /^\d+$/.test(bPart);
-    if (aIsNumber && bIsNumber) {
-      const numA = parseInt(aPart, 10);
-      const numB = parseInt(bPart, 10);
-      if (numA !== numB) {
-        return numA - numB;
-      }
-    } else {
-      const comparison = aPart.localeCompare(bPart);
-      if (comparison !== 0) {
-        return comparison;
-      }
-    }
-  }
-  return 0;
-};
-
 // src/components/view/VirtualTable/utils/recursiveSort.ts
 var recursiveSort = (items2, sortBy) => {
   if (sortBy.length) {
@@ -3260,7 +3269,7 @@ function VirtualTable(props) {
       const endDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[1]) : null;
       return rows.some((row) => {
         const dateValue = filterByItem.type === "dateRange" ? dayjs4(row[filterByItem.columnName].value) : null;
-        return row[filterByItem.columnName] && (filterByItem.type === "dateRange" ? (dateValue.isAfter(startDate) || dateValue.isSame(startDate)) && (dateValue.isBefore(endDate) || dateValue.isSame(endDate)) : filterByItem.type === "numberRange" ? row[filterByItem.columnName].value >= filterByItem.values[0] && row[filterByItem.columnName].value <= filterByItem.values[1] : filterByItem.values.includes(row[filterByItem.columnName].value?.toString() ?? ""));
+        return row[filterByItem.columnName] ? filterByItem.type === "dateRange" ? (dateValue.isAfter(startDate) || dateValue.isSame(startDate)) && (dateValue.isBefore(endDate) || dateValue.isSame(endDate)) : filterByItem.type === "numberRange" ? row[filterByItem.columnName].value >= filterByItem.values[0] && row[filterByItem.columnName].value <= filterByItem.values[1] : filterByItem.values.includes((row[filterByItem.columnName].value || "")?.toString()) : filterByItem.values.includes("");
       });
     });
     const filtered = nextFilterBy.length ? recursiveFilter(newRows, nextFilterBy) : filterBy.some(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nntc-ui",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "author": "NNTC",
   "description": "React UI-kit for NNTC",
   "type": "module",