nntc-ui 0.0.70 → 0.0.72

package/index.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { ButtonHTMLAttributes, ReactNode, DetailedHTMLProps, InputHTMLAttributes, PropsWithChildren, ChangeEvent, JSX, MutableRefObject, ReactElement, CSSProperties, HTMLProps, ElementType } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
+import defaultDayjs from 'dayjs';
 import { Placement } from '@floating-ui/react';
 
 type PropsObject = {
@@ -78,6 +79,8 @@ interface Props$k {
     defaultValues?: (string | undefined)[];
     onClear?: () => void;
     onValueChange?: (values: (string | undefined)[]) => void;
+    /** Локализованный инстанс dayjs из приложения (например, после dayjs.locale('ru')) */
+    dayjs?: typeof defaultDayjs;
 }
 declare function DateTime(props: UiProps<Props$k> & DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>): react_jsx_runtime.JSX.Element;
 
@@ -304,6 +307,7 @@ interface TableColumn {
 
 interface VirtualTableRef {
     resetFilters: () => void;
+    resetSorts: () => void;
 }
 
 type Size$1 = 'medium' | 'small';

package/index.js

@@ -841,7 +841,7 @@ function Select(props) {
 
 // src/components/common/DateTime/DateTime.tsx
 import classnames7 from "classnames";
-import dayjs2 from "dayjs";
+import defaultDayjs2 from "dayjs";
 import { useCallback as useCallback4, useEffect as useEffect4, useRef as useRef3, useState as useState5 } from "react";
 import { mergeRefs as mergeRefs3 } from "react-merge-refs";
 
@@ -879,7 +879,7 @@ var dateTime_default = {
 
 // src/components/common/DateTime/ui/CalendarPopover/CalendarPopover.tsx
 import classNames2 from "classnames";
-import dayjs from "dayjs";
+import defaultDayjs from "dayjs";
 import { useCallback as useCallback3, useEffect as useEffect3, useMemo as useMemo2, useState as useState4 } from "react";
 
 // src/components/common/DateTime/ui/CalendarPopover/calendarPopover.module.css
@@ -948,6 +948,7 @@ var calendarPopover_default = {
 import { Fragment as Fragment2, jsx as jsx13, jsxs as jsxs6 } from "react/jsx-runtime";
 function CalendarPopover(props) {
   const {
+    dayjs: dayjsFromProps,
     componentSize,
     isPeriod = true,
     valueType = "date",
@@ -957,20 +958,24 @@ function CalendarPopover(props) {
     onClear,
     classes
   } = props;
+  const dayjs3 = dayjsFromProps ?? defaultDayjs;
   const [viewType, setViewType] = useState4(valueType === "year" ? "yearsRange" : "month");
   const [currentItem, setCurrentItem] = useState4({
-    year: dayjs().year(),
-    month: dayjs().month()
+    year: dayjs3().year(),
+    month: dayjs3().month()
   });
-  const [startDate, setStartDate] = useState4(initStartDate ? dayjs(initStartDate).startOf("D").valueOf() : void 0);
-  const [endDate, setEndDate] = useState4(initEndDate ? dayjs(initEndDate).startOf("D").valueOf() : void 0);
-  const startDateMonth = useMemo2(() => startDate ? dayjs(startDate).startOf("M").valueOf() : void 0, [startDate]);
-  const endDateMonth = useMemo2(() => endDate ? dayjs(endDate).startOf("M").valueOf() : void 0, [endDate]);
-  const startYear = useMemo2(() => startDate ? dayjs(startDate).year() : void 0, [startDate]);
-  const endYear = useMemo2(() => endDate ? dayjs(endDate).year() : void 0, [endDate]);
+  const [startDate, setStartDate] = useState4(initStartDate ? dayjs3(initStartDate).startOf("D").valueOf() : void 0);
+  const [endDate, setEndDate] = useState4(initEndDate ? dayjs3(initEndDate).startOf("D").valueOf() : void 0);
+  const startDateMonth = useMemo2(
+    () => startDate ? dayjs3(startDate).startOf("M").valueOf() : void 0,
+    [startDate, dayjs3]
+  );
+  const endDateMonth = useMemo2(() => endDate ? dayjs3(endDate).startOf("M").valueOf() : void 0, [endDate, dayjs3]);
+  const startYear = useMemo2(() => startDate ? dayjs3(startDate).year() : void 0, [startDate, dayjs3]);
+  const endYear = useMemo2(() => endDate ? dayjs3(endDate).year() : void 0, [endDate, dayjs3]);
   const currentDate = useMemo2(
-    () => dayjs(new Date(currentItem.year, currentItem.month, 1)).startOf(viewType === "month" ? "M" : "y"),
-    [currentItem, viewType]
+    () => dayjs3(new Date(currentItem.year, currentItem.month, 1)).startOf(viewType === "month" ? "M" : "y"),
+    [currentItem, viewType, dayjs3]
   );
   const daysInMonth = currentDate.daysInMonth();
   const firstDayOfWeek = currentDate.startOf("M").day();
@@ -986,26 +991,26 @@ function CalendarPopover(props) {
     }
     if (valueType === "year") {
       if (!isPeriod && startDate) {
-        changeDates(dayjs(startDate).format("YYYY"));
+        changeDates(dayjs3(startDate).format("YYYY"));
         return;
       }
       if (isPeriod && startDate && endDate) {
-        changeDates(dayjs(startDate).format("YYYY"), dayjs(endDate).format("YYYY"));
+        changeDates(dayjs3(startDate).format("YYYY"), dayjs3(endDate).format("YYYY"));
         return;
       }
       return;
     }
     if (!isPeriod && startDate) {
-      changeDates(dayjs(startDate).format());
+      changeDates(dayjs3(startDate).format());
       return;
     }
     if (isPeriod && startDate && endDate) {
-      changeDates(dayjs(startDate).format(), dayjs(endDate).format());
+      changeDates(dayjs3(startDate).format(), dayjs3(endDate).format());
     }
   }, [startDate, endDate, isPeriod, valueType, changeDates, onClear]);
   const changeCurrentItem = useCallback3(
     (count) => () => {
-      const baseDate = dayjs(new Date(currentItem.year, currentItem.month, 1));
+      const baseDate = dayjs3(new Date(currentItem.year, currentItem.month, 1));
       const step = viewType === "yearsRange" ? count * 20 : count;
       const unit = viewType === "month" ? "month" : "year";
       const tempDate = baseDate.add(step, unit);
@@ -1037,7 +1042,7 @@ function CalendarPopover(props) {
   );
   const setYear = useCallback3(
     (cellYear) => () => {
-      const cellDate = dayjs(new Date(cellYear, 0, 1)).startOf("y").valueOf();
+      const cellDate = dayjs3(new Date(cellYear, 0, 1)).startOf("y").valueOf();
       if (!isPeriod) {
         if (startDate === cellDate) {
           setStartDate(void 0);
@@ -1136,8 +1141,8 @@ function CalendarPopover(props) {
   const today = useCallback3(
     (e) => {
       setCurrentItem({
-        year: dayjs().year(),
-        month: dayjs().month()
+        year: dayjs3().year(),
+        month: dayjs3().month()
       });
       e.currentTarget.blur();
     },
@@ -1350,10 +1355,12 @@ function DateTime(props) {
     values,
     onClear,
     onValueChange,
+    dayjs: dayjsFromProps,
     classes,
     ref,
     ...inputProps
   } = props;
+  const dayjs3 = dayjsFromProps ?? defaultDayjs2;
   const [stateValues, setStateValues] = useState5(
     values !== void 0 ? values : defaultValues
   );
@@ -1401,9 +1408,9 @@ function DateTime(props) {
             className: classnames7(input3, classes?.input),
             placeholder,
             ...inputProps,
-            value: stateValues?.[0] ? isPeriod && stateValues[1] ? `${dayjs2(stateValues[0]).format(valueType === "year" ? "YYYY" : "DD.MM.YYYY")} - ${dayjs2(
+            value: stateValues?.[0] ? isPeriod && stateValues[1] ? `${dayjs3(stateValues[0]).format(valueType === "year" ? "YYYY" : "DD.MM.YYYY")} - ${dayjs3(
               stateValues[1]
-            ).format(valueType === "year" ? "YYYY" : "DD.MM.YYYY")}` : `${dayjs2(stateValues[0]).format(valueType === "year" ? "YYYY" : "DD.MM.YYYY")}` : "",
+            ).format(valueType === "year" ? "YYYY" : "DD.MM.YYYY")}` : `${dayjs3(stateValues[0]).format(valueType === "year" ? "YYYY" : "DD.MM.YYYY")}` : "",
             onChange: () => {
             },
             onClick: inputClickHandler
@@ -1419,6 +1426,7 @@ function DateTime(props) {
             description: /* @__PURE__ */ jsx14(
               CalendarPopover,
               {
+                dayjs: dayjs3,
                 classes,
                 componentSize,
                 isPeriod,
@@ -2754,7 +2762,7 @@ function Tabs(props) {
 import { flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
 import { defaultRangeExtractor, useVirtualizer } from "@tanstack/react-virtual";
 import classnames22 from "classnames";
-import dayjs4 from "dayjs";
+import dayjs2 from "dayjs";
 import {
   Fragment as Fragment8,
   forwardRef as forwardRef8,
@@ -3473,14 +3481,14 @@ var getPrevHorizontalHeaders = (headers, currentIndex) => {
 };
 
 // src/components/view/VirtualTable/utils/recursiveFilter.ts
-import dayjs3 from "dayjs";
+import dayjs from "dayjs";
 var recursiveFilter = (rows, filterBy) => {
   if (filterBy.length) {
     const filterByItem = filterBy[filterBy.length - 1];
-    const startDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[0]) : null;
-    const endDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[1]) : null;
+    const startDate = filterByItem.type === "dateRange" ? dayjs(filterByItem.values[0]) : null;
+    const endDate = filterByItem.type === "dateRange" ? dayjs(filterByItem.values[1]) : null;
     const filtered = filterByItem.values.length ? rows.filter((row) => {
-      const dateValue = filterByItem.type === "dateRange" ? dayjs3(row[filterByItem.columnName].value) : null;
+      const dateValue = filterByItem.type === "dateRange" ? dayjs(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()) : filterByItem.values.includes("")) || row.isNew?.value === 1;
     }) : rows;
     return recursiveFilter(filtered, filterBy.slice(0, filterBy.length - 1));
@@ -3558,15 +3566,15 @@ var VirtualTable = forwardRef8((props, ref) => {
   const memoizedData = useMemo8(() => {
     const newRows = [...rows];
     const nextFilterBy = filterBy.filter((filterByItem) => {
-      const startDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[0]) : null;
-      const endDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[1]) : null;
+      const startDate = filterByItem.type === "dateRange" ? dayjs2(filterByItem.values[0]) : null;
+      const endDate = filterByItem.type === "dateRange" ? dayjs2(filterByItem.values[1]) : null;
       return rows.some((row) => {
-        const dateValue = filterByItem.type === "dateRange" ? dayjs4(row[filterByItem.columnName].value) : null;
+        const dateValue = filterByItem.type === "dateRange" ? dayjs2(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()) : filterByItem.values.includes("");
       });
     });
     const filtered = nextFilterBy.length ? recursiveFilter(newRows, nextFilterBy) : filterBy.some(
-      (fb) => fb.type === "numberRange" && fb.values.some((v) => v !== Infinity && v !== -Infinity) || fb.type === "dateRange" && fb.values.some((v) => !dayjs4(v).isSame(dayjs4(0)) && !dayjs4(v).isSame(dayjs4(Number.MAX_SAFE_INTEGER)))
+      (fb) => fb.type === "numberRange" && fb.values.some((v) => v !== Infinity && v !== -Infinity) || fb.type === "dateRange" && fb.values.some((v) => !dayjs2(v).isSame(dayjs2(0)) && !dayjs2(v).isSame(dayjs2(Number.MAX_SAFE_INTEGER)))
     ) ? [] : newRows;
     const sorted = sortBy.length ? recursiveSort(filtered, sortBy) : filtered;
     const result = rowNumberColumnId ? sorted.map((row, index) => ({
@@ -3656,8 +3664,12 @@ var VirtualTable = forwardRef8((props, ref) => {
   const resetFilters = () => {
     setFilterBy([]);
   };
+  const resetSorts = () => {
+    setSortBy([{ columnName: "isNew", direction: "desc" }]);
+  };
   useImperativeHandle(ref, () => ({
-    resetFilters
+    resetFilters,
+    resetSorts
   }));
   useEffect8(() => {
     if (tableContainerRef?.current) {

package/package.json

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