@danikokonn/yarik-frontend-lib 2.1.2 → 2.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import "moment/locale/ru";
1
+ import "dayjs/locale/ru";
2
2
  import DateTimeRangePickerProps from "./DateTimeRangePickerProps";
3
3
  export default function DateTimeRangePicker({ disableFuture, disabled, fromDatetime, toDateTime, required, error, onStartDateSet, onEndDateSet, }: DateTimeRangePickerProps): import("react/jsx-runtime").JSX.Element;
4
4
  //# sourceMappingURL=DateTimeRangePicker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DateTimeRangePicker.d.ts","sourceRoot":"","sources":["../../../src/components/DateTimeRangePicker/DateTimeRangePicker.tsx"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,KAAK,EACL,cAAc,EACd,YAAY,GACb,EAAE,wBAAwB,2CAmF1B"}
1
+ {"version":3,"file":"DateTimeRangePicker.d.ts","sourceRoot":"","sources":["../../../src/components/DateTimeRangePicker/DateTimeRangePicker.tsx"],"names":[],"mappings":"AAQA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAKlE,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,KAAK,EACL,cAAc,EACd,YAAY,GACb,EAAE,wBAAwB,2CAmF1B"}
@@ -1,17 +1,22 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import Stack from "@mui/material/Stack";
3
3
  import { DesktopDateTimePicker, LocalizationProvider, } from "@mui/x-date-pickers";
4
- import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment";
5
- import moment from "moment-timezone";
6
- import "moment/locale/ru";
4
+ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
5
+ import { ruRU } from "@mui/x-date-pickers/locales";
6
+ import dayjs from "dayjs";
7
+ import "dayjs/locale/ru";
8
+ import timezone from "dayjs/plugin/timezone";
9
+ import utc from "dayjs/plugin/utc";
7
10
  import { useState } from "react";
11
+ dayjs.extend(utc);
12
+ dayjs.extend(timezone);
8
13
  export default function DateTimeRangePicker({ disableFuture, disabled, fromDatetime, toDateTime, required, error, onStartDateSet, onEndDateSet, }) {
9
14
  const [fromDatetimePickerOpen, setFromDatetimePickerOpen] = useState(false);
10
15
  const [toDatetimePickerOpen, setToDatetimePickerOpen] = useState(false);
11
- const fromDttm = fromDatetime.length > 0 ? moment(fromDatetime) : null;
12
- const toDttm = toDateTime.length > 0 ? moment(toDateTime) : null;
13
- return (_jsx(LocalizationProvider, { dateAdapter: AdapterMoment, adapterLocale: "ru", dateLibInstance: moment, children: _jsxs(Stack, { direction: "row", sx: { m: 2 }, spacing: 2, children: [_jsx(DesktopDateTimePicker, { disabled: disabled, open: fromDatetimePickerOpen, reduceAnimations: true, onChange: (v, _c) => {
14
- onStartDateSet((v && v.toISOString(true)) || "");
16
+ const fromDttm = fromDatetime.length > 0 ? dayjs(fromDatetime) : null;
17
+ const toDttm = toDateTime.length > 0 ? dayjs(toDateTime) : null;
18
+ return (_jsx(LocalizationProvider, { dateAdapter: AdapterDayjs, adapterLocale: "ru", localeText: ruRU.components.MuiLocalizationProvider.defaultProps.localeText, children: _jsxs(Stack, { direction: "row", sx: { m: 2 }, spacing: 2, children: [_jsx(DesktopDateTimePicker, { disabled: disabled, open: fromDatetimePickerOpen, reduceAnimations: true, onChange: (v) => {
19
+ onStartDateSet((v && v.format()) || "");
15
20
  }, disableFuture: disableFuture, views: ["year", "month", "day", "hours", "minutes", "seconds"], timezone: "Europe/Moscow", ampm: false, ampmInClock: false, value: fromDttm, timeSteps: { hours: 1, minutes: 1, seconds: 1 }, slotProps: {
16
21
  field: {
17
22
  clearable: true,
@@ -27,8 +32,8 @@ export default function DateTimeRangePicker({ disableFuture, disabled, fromDatet
27
32
  position: "start",
28
33
  onClick: () => setFromDatetimePickerOpen(true),
29
34
  },
30
- }, onClose: () => setFromDatetimePickerOpen(false) }), _jsx(DesktopDateTimePicker, { disabled: disabled, open: toDatetimePickerOpen, reduceAnimations: true, onChange: (v, _c) => {
31
- onEndDateSet((v && v.toISOString(true)) || "");
35
+ }, onClose: () => setFromDatetimePickerOpen(false) }), _jsx(DesktopDateTimePicker, { disabled: disabled, open: toDatetimePickerOpen, reduceAnimations: true, onChange: (v) => {
36
+ onEndDateSet((v && v.format()) || "");
32
37
  }, disableFuture: disableFuture, views: ["year", "month", "day", "hours", "minutes", "seconds"], timezone: "Europe/Moscow", ampm: false, ampmInClock: false, timeSteps: { hours: 1, minutes: 1, seconds: 1 }, value: toDttm, slotProps: {
33
38
  field: {
34
39
  clearable: true,
@@ -1,4 +1,3 @@
1
- import "moment/locale/ru";
2
1
  import { JSX } from "react";
3
2
  import DatetimeRangeInputProps from "./DatetimeRangeInputProps";
4
3
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"DatetimeRangeInput.d.ts","sourceRoot":"","sources":["../../../src/components/DatetimeRangeInput/DatetimeRangeInput.tsx"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAoC,MAAM,OAAO,CAAC;AAE9D,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAKhE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,IAAI,EACJ,EAAE,EACF,OAAO,EACP,EAAE,EACF,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,QAAQ,GACT,EAAE,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAiHvC"}
1
+ {"version":3,"file":"DatetimeRangeInput.d.ts","sourceRoot":"","sources":["../../../src/components/DatetimeRangeInput/DatetimeRangeInput.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAoB,MAAM,OAAO,CAAC;AAG9C,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,IAAI,EACJ,EAAE,EACF,OAAO,EACP,EAAE,EACF,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,QAAQ,GACT,EAAE,uBAAuB,GAAG,GAAG,CAAC,OAAO,CA8FvC"}
@@ -1,15 +1,13 @@
1
- import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
1
+ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import ClearIcon from "@mui/icons-material/Clear";
3
3
  import DateRangeIcon from "@mui/icons-material/DateRange";
4
- import { Skeleton, Stack } from "@mui/material";
5
4
  import IconButton from "@mui/material/IconButton";
6
5
  import Popover from "@mui/material/Popover";
7
6
  import TextField from "@mui/material/TextField";
8
- import moment from "moment-timezone";
9
- import "moment/locale/ru";
10
- import { lazy, Suspense, useRef, useState } from "react";
7
+ import dayjs from "dayjs";
8
+ import { useRef, useState } from "react";
11
9
  import { prettyDatetime } from "../../utils";
12
- const DateTimeRangePicker = lazy(() => import("../DateTimeRangePicker/DateTimeRangePicker"));
10
+ import DateTimeRangePicker from "../DateTimeRangePicker/DateTimeRangePicker";
13
11
  /**
14
12
  * Компонент выбора диапазона дат и времени.
15
13
  *
@@ -40,7 +38,7 @@ export default function DatetimeRangeInput({ onDateRangeSet, from, to, variant,
40
38
  const rangeValid = fromDatetime &&
41
39
  toDateTime &&
42
40
  fromDatetime !== toDateTime &&
43
- moment(fromDatetime) < moment(toDateTime);
41
+ dayjs(fromDatetime).isBefore(dayjs(toDateTime));
44
42
  return (_jsxs(_Fragment, { children: [_jsx(TextField, { size: size, variant: variant || "standard", disabled: disabled, required: required, placeholder: variant === "outlined" ? undefined : placeholder, label: variant === "outlined" ? placeholder : undefined, slotProps: {
45
43
  input: {
46
44
  startAdornment: _jsx(DateRangeIcon, {}),
@@ -64,11 +62,11 @@ export default function DatetimeRangeInput({ onDateRangeSet, from, to, variant,
64
62
  paper: {
65
63
  sx: { minWidth: "30rem" },
66
64
  },
67
- }, children: _jsx(Suspense, { fallback: _jsxs(Stack, { direction: "row", spacing: 2, sx: { m: 1 }, children: [_jsx(Skeleton, { variant: "rounded", width: 231, height: 32, animation: "wave" }), _jsx(Skeleton, { variant: "rounded", width: 231, height: 32, animation: "wave" })] }), children: _jsx(DateTimeRangePicker, { required: required, disableFuture: true, disabled: disabled, fromDatetime: fromDatetime, toDateTime: toDateTime, onStartDateSet: (s) => {
68
- setFromDatetime(s);
69
- onDateRangeSet(s, toDateTime);
70
- }, onEndDateSet: (e) => {
71
- setToDatetime(e);
72
- onDateRangeSet(fromDatetime, e);
73
- } }) }) })] }));
65
+ }, children: _jsx(DateTimeRangePicker, { required: required, disableFuture: true, disabled: disabled, fromDatetime: fromDatetime, toDateTime: toDateTime, onStartDateSet: (s) => {
66
+ setFromDatetime(s);
67
+ onDateRangeSet(s, toDateTime);
68
+ }, onEndDateSet: (e) => {
69
+ setToDatetime(e);
70
+ onDateRangeSet(fromDatetime, e);
71
+ } }) })] }));
74
72
  }
@@ -1,4 +1,4 @@
1
- import "moment/locale/ru";
1
+ import "dayjs/locale/ru";
2
2
  import LocalizedDatetimePickerProps from "./LocalizedDatetimePickerProps";
3
3
  export default function LocalizedDateTimePicker({ disableFuture, disabled, value, required, variant, size, onChange, }: LocalizedDatetimePickerProps): import("react/jsx-runtime").JSX.Element;
4
4
  //# sourceMappingURL=LocalizedDatetimePicker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"LocalizedDatetimePicker.d.ts","sourceRoot":"","sources":["../../../src/components/LocalizedDatetimePicker/LocalizedDatetimePicker.tsx"],"names":[],"mappings":"AAMA,OAAO,kBAAkB,CAAC;AAG1B,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE,4BAA4B,2CA6C9B"}
1
+ {"version":3,"file":"LocalizedDatetimePicker.d.ts","sourceRoot":"","sources":["../../../src/components/LocalizedDatetimePicker/LocalizedDatetimePicker.tsx"],"names":[],"mappings":"AAOA,OAAO,iBAAiB,CAAC;AAKzB,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAK1E,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE,4BAA4B,2CA6C9B"}
@@ -1,15 +1,20 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { DesktopDateTimePicker, LocalizationProvider, } from "@mui/x-date-pickers";
3
- import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment";
4
- import moment from "moment-timezone";
5
- import "moment/locale/ru";
3
+ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
4
+ import { ruRU } from "@mui/x-date-pickers/locales";
5
+ import dayjs from "dayjs";
6
+ import "dayjs/locale/ru";
7
+ import timezone from "dayjs/plugin/timezone";
8
+ import utc from "dayjs/plugin/utc";
6
9
  import { useState } from "react";
7
10
  import { useDebounce } from "../../utils";
11
+ dayjs.extend(utc);
12
+ dayjs.extend(timezone);
8
13
  export default function LocalizedDateTimePicker({ disableFuture, disabled, value, required, variant, size, onChange, }) {
9
14
  const [open, setOpen] = useState(false);
10
- const datetime = value?.length > 0 ? moment(value) : null;
11
- return (_jsx(LocalizationProvider, { dateAdapter: AdapterMoment, adapterLocale: "ru", dateLibInstance: moment, children: _jsx(DesktopDateTimePicker, { disabled: disabled, open: open, reduceAnimations: true, onChange: useDebounce((v, _c) => {
12
- onChange((v && v.toISOString(true)) || "");
15
+ const datetime = value?.length > 0 ? dayjs(value) : null;
16
+ return (_jsx(LocalizationProvider, { dateAdapter: AdapterDayjs, adapterLocale: "ru", localeText: ruRU.components.MuiLocalizationProvider.defaultProps.localeText, children: _jsx(DesktopDateTimePicker, { disabled: disabled, open: open, reduceAnimations: true, onChange: useDebounce((v) => {
17
+ onChange((v && v.format()) || "");
13
18
  }, 200), disableFuture: disableFuture, views: ["year", "month", "day", "hours", "minutes", "seconds"], timezone: "Europe/Moscow", ampm: false, ampmInClock: false, value: datetime, timeSteps: { hours: 1, minutes: 1, seconds: 1 }, slotProps: {
14
19
  field: {
15
20
  clearable: true,
@@ -1 +1 @@
1
- {"version":3,"file":"TaskStateDialog.d.ts","sourceRoot":"","sources":["../../../src/components/TaskStateDialog/TaskStateDialog.tsx"],"names":[],"mappings":"AAOA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAwB1D,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,SAAS,EACT,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,EACR,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,cAAc,GACf,EAAE,oBAAoB,2CA8LtB"}
1
+ {"version":3,"file":"TaskStateDialog.d.ts","sourceRoot":"","sources":["../../../src/components/TaskStateDialog/TaskStateDialog.tsx"],"names":[],"mappings":"AAgBA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAY1D,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,SAAS,EACT,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,EACR,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,cAAc,GACf,EAAE,oBAAoB,2CA8LtB"}
@@ -1,20 +1,20 @@
1
1
  import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { useTheme } from "@mui/material";
3
+ import AppBar from "@mui/material/AppBar";
4
+ import Badge from "@mui/material/Badge";
5
+ import CircularProgress from "@mui/material/CircularProgress";
3
6
  import Dialog from "@mui/material/Dialog";
7
+ import IconButton from "@mui/material/IconButton";
8
+ import Stack from "@mui/material/Stack";
9
+ import Toolbar from "@mui/material/Toolbar";
10
+ import Tooltip from "@mui/material/Tooltip";
11
+ import Typography from "@mui/material/Typography";
4
12
  import Zoom from "@mui/material/Zoom";
13
+ import CloseIcon from "@mui/icons-material/Close";
5
14
  import React from "react";
6
15
  import { useAirflowContext } from "../../providers/AirflowProvider";
7
16
  import { useDagRunStateContext } from "../../providers/DagStateProvider";
8
- const AppBar = React.lazy(() => import("@mui/material/AppBar"));
9
- const Stack = React.lazy(() => import("@mui/material/Stack"));
10
- const Toolbar = React.lazy(() => import("@mui/material/Toolbar"));
11
- const IconButton = React.lazy(() => import("@mui/material/IconButton"));
12
- const Typography = React.lazy(() => import("@mui/material/Typography"));
13
- const Tooltip = React.lazy(() => import("@mui/material/Tooltip"));
14
- const Badge = React.lazy(() => import("@mui/material/Badge"));
15
- const CloseIcon = React.lazy(() => import("@mui/icons-material/Close"));
16
- const CircularProgress = React.lazy(() => import("@mui/material/CircularProgress"));
17
- const TaskLoader = React.lazy(() => import("../TaskLoader/TaskLoader"));
17
+ import TaskLoader from "../TaskLoader/TaskLoader";
18
18
  const Transition = React.forwardRef(function Transition(props, ref) {
19
19
  return _jsx(Zoom, { ref: ref, ...props });
20
20
  });
@@ -69,7 +69,7 @@ export default function TaskStateDialog({ taskTitle, subTitle, appendedTitle, vi
69
69
  setLoading(true);
70
70
  },
71
71
  },
72
- }, children: _jsxs(React.Suspense, { fallback: _jsx(_Fragment, {}), children: [_jsx(AppBar, { sx: { position: "relative" }, color: color, children: _jsxs(Toolbar, { children: [_jsx(IconButton, { disabled: disableClosing, edge: "start", color: "inherit", onClick: () => onClose(), "aria-label": "close", children: _jsx(CloseIcon, {}) }), _jsx(Stack, { sx: {
72
+ }, children: _jsxs(_Fragment, { children: [_jsx(AppBar, { sx: { position: "relative" }, color: color, children: _jsxs(Toolbar, { children: [_jsx(IconButton, { disabled: disableClosing, edge: "start", color: "inherit", onClick: () => onClose(), "aria-label": "close", children: _jsx(CloseIcon, {}) }), _jsx(Stack, { sx: {
73
73
  ml: 2,
74
74
  flex: 1,
75
75
  flexWrap: "nowrap",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@danikokonn/yarik-frontend-lib",
3
- "version": "2.1.2",
3
+ "version": "2.1.3",
4
4
  "license": "Apache-2.0",
5
5
  "description": "",
6
6
  "author": "",
@@ -21,7 +21,7 @@
21
21
  "@types/moment-duration-format": "^2.2.7",
22
22
  "@types/react": "^19.2.14",
23
23
  "@types/react-dom": "^19.2.3",
24
- "@vitest/coverage-v8": "^4.1.0",
24
+ "@vitest/coverage-v8": "^4.1.2",
25
25
  "eslint": "^9.39.4",
26
26
  "eslint-plugin-react": "^7.37.5",
27
27
  "eslint-plugin-unicorn": "^62.0.0",
@@ -33,32 +33,33 @@
33
33
  "ts-loader": "^9.5.4",
34
34
  "tss-react": "^4.9.20",
35
35
  "typescript": "^5.9.3",
36
- "typescript-eslint": "^8.57.1",
36
+ "typescript-eslint": "^8.57.2",
37
37
  "vitest": "^4.1.0"
38
38
  },
39
39
  "dependencies": {
40
- "@emotion/react": "^11.14.0",
41
- "@emotion/styled": "^11.14.1",
42
- "@mui/icons-material": "^7.3.9",
43
- "@mui/material": "^7.3.9",
44
- "@mui/x-date-pickers": "^8.27.2",
45
40
  "@tsconfig/strictest": "^2.0.8",
46
41
  "css-loader": "^7.1.4",
42
+ "dayjs": "^1.11.20",
47
43
  "moment": "^2.30.1",
48
44
  "moment-duration-format": "^2.3.2",
49
45
  "moment-timezone": "^0.6.1",
50
- "notistack": "^3.0.2",
51
- "react-imask": "^7.6.1",
52
46
  "react-json-tree": "^0.20.0",
53
- "react-router": "^7.13.1",
54
- "react-virtuoso": "^4.18.3",
55
47
  "style-loader": "^4.0.0",
56
- "swr": "^2.4.1",
57
48
  "transliteration": "^2.6.1"
58
49
  },
59
50
  "peerDependencies": {
51
+ "@emotion/react": "^11.14.0",
52
+ "@emotion/styled": "^11.14.1",
53
+ "@mui/icons-material": "^7.3.9",
54
+ "@mui/material": "^7.3.9",
55
+ "@mui/x-date-pickers": "^8.27.2",
56
+ "notistack": "^3.0.2",
60
57
  "react": ">=18 <20",
61
- "react-dom": ">=18 <20"
58
+ "react-dom": ">=18 <20",
59
+ "react-imask": "^7.6.1",
60
+ "react-router": "^7.13.2",
61
+ "react-virtuoso": "^4.18.3",
62
+ "swr": "^2.4.1"
62
63
  },
63
64
  "scripts": {
64
65
  "test": "vitest",