Skip to content

Commit 163f483

Browse files
csm-thucsm-thu
committed
build: upgrade @mui/x-date-pickers to v7
1 parent 3c04212 commit 163f483

File tree

3 files changed

+120
-113
lines changed

3 files changed

+120
-113
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"dependencies": {
8787
"@emotion/react": "^11.13.0",
8888
"@emotion/styled": "^11.13.0",
89-
"@mui/x-date-pickers": "^5.0.20",
89+
"@mui/x-date-pickers": "^7.23.6",
9090
"@nosferatu500/react-sortable-tree": "^3.0.6",
9191
"ag-grid-community": "~32.0.2",
9292
"ag-grid-react": "~32.0.2",

‎src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the MIT license.
33
import React, { useCallback, useEffect, useMemo, useState } from 'react';
44
import PropTypes from 'prop-types';
5-
import { Stack, TextField } from '@mui/material';
5+
import { Stack } from '@mui/material';
66
import makeStyles from '@mui/styles/makeStyles';
7-
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
7+
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
88
import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
99
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
1010
import { DateUtils } from '@cosmotech/core';
@@ -92,17 +92,16 @@ export const BasicDateInput = (props) => {
9292
inputFormat={format}
9393
minDate={minDate}
9494
maxDate={maxDate}
95-
renderInput={({ error: _, ...params }) => (
96-
<TextField
97-
id={`date-text-field-${id}`}
98-
variant="outlined"
99-
sx={{ flexGrow: 1 }}
100-
size={size}
101-
error={error?.message?.length > 0}
102-
helperText={error?.message ?? ''}
103-
{...params}
104-
/>
105-
)}
95+
slotProps={{
96+
textField: {
97+
id: `date-text-field-${id}`,
98+
variant: 'outlined',
99+
sx: { flexGrow: 1 },
100+
size,
101+
error: error?.message?.length > 0,
102+
helperText: error?.message ?? '',
103+
},
104+
}}
106105
id={`date-input-${id}`}
107106
onChange={onChange}
108107
value={internalDate ?? new Date(undefined)}

‎yarn.lock‎

Lines changed: 107 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,7 @@ __metadata:
18831883
languageName: node
18841884
linkType: hard
18851885

1886-
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
1886+
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
18871887
version: 7.24.4
18881888
resolution: "@babel/runtime@npm:7.24.4"
18891889
dependencies:
@@ -1892,6 +1892,15 @@ __metadata:
18921892
languageName: node
18931893
linkType: hard
18941894

1895+
"@babel/runtime@npm:^7.25.7, @babel/runtime@npm:^7.26.0":
1896+
version: 7.26.0
1897+
resolution: "@babel/runtime@npm:7.26.0"
1898+
dependencies:
1899+
regenerator-runtime: "npm:^0.14.0"
1900+
checksum: 10c0/12c01357e0345f89f4f7e8c0e81921f2a3e3e101f06e8eaa18a382b517376520cd2fa8c237726eb094dab25532855df28a7baaf1c26342b52782f6936b07c287
1901+
languageName: node
1902+
linkType: hard
1903+
18951904
"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
18961905
version: 7.24.0
18971906
resolution: "@babel/template@npm:7.24.0"
@@ -2111,7 +2120,7 @@ __metadata:
21112120
"@mui/lab": "npm:^5.0.0-alpha.170"
21122121
"@mui/material": "npm:^5.16.5"
21132122
"@mui/styles": "npm:^5.16.5"
2114-
"@mui/x-date-pickers": "npm:^5.0.20"
2123+
"@mui/x-date-pickers": "npm:^7.23.6"
21152124
"@nosferatu500/react-sortable-tree": "npm:^3.0.6"
21162125
"@rollup/plugin-babel": "npm:^6.0.4"
21172126
"@rollup/plugin-commonjs": "npm:^26.0.1"
@@ -2175,69 +2184,6 @@ __metadata:
21752184
languageName: unknown
21762185
linkType: soft
21772186

2178-
"@date-io/core@npm:^2.15.0, @date-io/core@npm:^2.17.0":
2179-
version: 2.17.0
2180-
resolution: "@date-io/core@npm:2.17.0"
2181-
checksum: 10c0/e56df44e9b0bc14eefad8509fef2f4a0b847ea01ad0f2cf6b7b5fce5f69120e607a90b6436e84266a2b0336b6bb986fd3f56c3f4b897db85578b9050ac6610bd
2182-
languageName: node
2183-
linkType: hard
2184-
2185-
"@date-io/date-fns@npm:^2.15.0":
2186-
version: 2.17.0
2187-
resolution: "@date-io/date-fns@npm:2.17.0"
2188-
dependencies:
2189-
"@date-io/core": "npm:^2.17.0"
2190-
peerDependencies:
2191-
date-fns: ^2.0.0
2192-
peerDependenciesMeta:
2193-
date-fns:
2194-
optional: true
2195-
checksum: 10c0/0c2a4d4a841d7918e3e7457ee18d3cee469246be71a6e78879c7b0ec7bac29de7f3a63659fed6b1da2976527bec9886f509836d399c6a066aa502acf9ade2e60
2196-
languageName: node
2197-
linkType: hard
2198-
2199-
"@date-io/dayjs@npm:^2.15.0":
2200-
version: 2.17.0
2201-
resolution: "@date-io/dayjs@npm:2.17.0"
2202-
dependencies:
2203-
"@date-io/core": "npm:^2.17.0"
2204-
peerDependencies:
2205-
dayjs: ^1.8.17
2206-
peerDependenciesMeta:
2207-
dayjs:
2208-
optional: true
2209-
checksum: 10c0/ecf92e37a1c5afae91a8e6acb580e17dcb2b32ee2a461a5302dfb05acbcd0076c819eaa2a968f6005162aba7788ffff1b8cfbe63553484b98f79e308d6bba140
2210-
languageName: node
2211-
linkType: hard
2212-
2213-
"@date-io/luxon@npm:^2.15.0":
2214-
version: 2.17.0
2215-
resolution: "@date-io/luxon@npm:2.17.0"
2216-
dependencies:
2217-
"@date-io/core": "npm:^2.17.0"
2218-
peerDependencies:
2219-
luxon: ^1.21.3 || ^2.x || ^3.x
2220-
peerDependenciesMeta:
2221-
luxon:
2222-
optional: true
2223-
checksum: 10c0/e12bd7d8c38af73380f606735006aa0afc13d3db2541f0c13c3169bb7e375e97adc2c8bde113c472c78e1843a74c6b0930dc93fae6a6a62d87be8cb9b323ce8a
2224-
languageName: node
2225-
linkType: hard
2226-
2227-
"@date-io/moment@npm:^2.15.0":
2228-
version: 2.17.0
2229-
resolution: "@date-io/moment@npm:2.17.0"
2230-
dependencies:
2231-
"@date-io/core": "npm:^2.17.0"
2232-
peerDependencies:
2233-
moment: ^2.24.0
2234-
peerDependenciesMeta:
2235-
moment:
2236-
optional: true
2237-
checksum: 10c0/7fb24a7155ecf6a10ebbb61db8d3f82017773b5dfd38e301786ff67b667ec9fb7ca377fe64557978249b6f53f421292a0cd84c30720496477e806f5f0cac1579
2238-
languageName: node
2239-
linkType: hard
2240-
22412187
"@emotion/babel-plugin@npm:^11.12.0":
22422188
version: 11.12.0
22432189
resolution: "@emotion/babel-plugin@npm:11.12.0"
@@ -3137,7 +3083,19 @@ __metadata:
31373083
languageName: node
31383084
linkType: hard
31393085

3140-
"@mui/utils@npm:^5.10.3, @mui/utils@npm:^5.15.14":
3086+
"@mui/types@npm:^7.2.21":
3087+
version: 7.2.21
3088+
resolution: "@mui/types@npm:7.2.21"
3089+
peerDependencies:
3090+
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
3091+
peerDependenciesMeta:
3092+
"@types/react":
3093+
optional: true
3094+
checksum: 10c0/c0038ae402a3cfb2805a19167362fb5ac2ca1403f0ef3dad688d1e2276afe757b69d5fb1e3af4cd0e985b9221d287fd863c5b00f29fd07a276c7de9e3423a0f3
3095+
languageName: node
3096+
linkType: hard
3097+
3098+
"@mui/utils@npm:^5.15.14":
31413099
version: 5.15.14
31423100
resolution: "@mui/utils@npm:5.15.14"
31433101
dependencies:
@@ -3175,47 +3133,83 @@ __metadata:
31753133
languageName: node
31763134
linkType: hard
31773135

3178-
"@mui/x-date-pickers@npm:^5.0.20":
3179-
version: 5.0.20
3180-
resolution: "@mui/x-date-pickers@npm:5.0.20"
3136+
"@mui/utils@npm:^5.16.6 || ^6.0.0":
3137+
version: 6.4.0
3138+
resolution: "@mui/utils@npm:6.4.0"
31813139
dependencies:
3182-
"@babel/runtime": "npm:^7.18.9"
3183-
"@date-io/core": "npm:^2.15.0"
3184-
"@date-io/date-fns": "npm:^2.15.0"
3185-
"@date-io/dayjs": "npm:^2.15.0"
3186-
"@date-io/luxon": "npm:^2.15.0"
3187-
"@date-io/moment": "npm:^2.15.0"
3188-
"@mui/utils": "npm:^5.10.3"
3189-
"@types/react-transition-group": "npm:^4.4.5"
3190-
clsx: "npm:^1.2.1"
3191-
prop-types: "npm:^15.7.2"
3140+
"@babel/runtime": "npm:^7.26.0"
3141+
"@mui/types": "npm:^7.2.21"
3142+
"@types/prop-types": "npm:^15.7.14"
3143+
clsx: "npm:^2.1.1"
3144+
prop-types: "npm:^15.8.1"
3145+
react-is: "npm:^19.0.0"
3146+
peerDependencies:
3147+
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
3148+
react: ^17.0.0 || ^18.0.0 || ^19.0.0
3149+
peerDependenciesMeta:
3150+
"@types/react":
3151+
optional: true
3152+
checksum: 10c0/c72ab7685affb577f1b48a5f5be02d11254cddf858cc35d61e0483434249cc064f2d145e9e72be60c344f31ccc7d6e61c59a256413b7e68077e883c0ffc8882e
3153+
languageName: node
3154+
linkType: hard
3155+
3156+
"@mui/x-date-pickers@npm:^7.23.6":
3157+
version: 7.23.6
3158+
resolution: "@mui/x-date-pickers@npm:7.23.6"
3159+
dependencies:
3160+
"@babel/runtime": "npm:^7.25.7"
3161+
"@mui/utils": "npm:^5.16.6 || ^6.0.0"
3162+
"@mui/x-internals": "npm:7.23.6"
3163+
"@types/react-transition-group": "npm:^4.4.11"
3164+
clsx: "npm:^2.1.1"
3165+
prop-types: "npm:^15.8.1"
31923166
react-transition-group: "npm:^4.4.5"
3193-
rifm: "npm:^0.12.1"
31943167
peerDependencies:
31953168
"@emotion/react": ^11.9.0
31963169
"@emotion/styled": ^11.8.1
3197-
"@mui/material": ^5.4.1
3198-
"@mui/system": ^5.4.1
3199-
date-fns: ^2.25.0
3170+
"@mui/material": ^5.15.14 || ^6.0.0
3171+
"@mui/system": ^5.15.14 || ^6.0.0
3172+
date-fns: ^2.25.0 || ^3.2.0 || ^4.0.0
3173+
date-fns-jalali: ^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0
32003174
dayjs: ^1.10.7
3201-
luxon: ^1.28.0 || ^2.0.0 || ^3.0.0
3202-
moment: ^2.29.1
3203-
react: ^17.0.2 || ^18.0.0
3204-
react-dom: ^17.0.2 || ^18.0.0
3175+
luxon: ^3.0.2
3176+
moment: ^2.29.4
3177+
moment-hijri: ^2.1.2 || ^3.0.0
3178+
moment-jalaali: ^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0
3179+
react: ^17.0.0 || ^18.0.0 || ^19.0.0
3180+
react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
32053181
peerDependenciesMeta:
32063182
"@emotion/react":
32073183
optional: true
32083184
"@emotion/styled":
32093185
optional: true
32103186
date-fns:
32113187
optional: true
3188+
date-fns-jalali:
3189+
optional: true
32123190
dayjs:
32133191
optional: true
32143192
luxon:
32153193
optional: true
32163194
moment:
32173195
optional: true
3218-
checksum: 10c0/50534dcf567281b4066b600abfc9c2dc083c07d077a53a91a37a48dc6dcdba86a67607570d1bc4e4ae7e374ede5a30a9cc2a4c5787d4d172818a742134a0c50f
3196+
moment-hijri:
3197+
optional: true
3198+
moment-jalaali:
3199+
optional: true
3200+
checksum: 10c0/aaaa179e0657f51e46b179eb33dd7ed36761ab9e1731895191da977ae0f9d7254b4915cd3695fc438d1972d7cdb6873c8b8f5d60b3f1187be2720ceab48573b6
3201+
languageName: node
3202+
linkType: hard
3203+
3204+
"@mui/x-internals@npm:7.23.6":
3205+
version: 7.23.6
3206+
resolution: "@mui/x-internals@npm:7.23.6"
3207+
dependencies:
3208+
"@babel/runtime": "npm:^7.25.7"
3209+
"@mui/utils": "npm:^5.16.6 || ^6.0.0"
3210+
peerDependencies:
3211+
react: ^17.0.0 || ^18.0.0 || ^19.0.0
3212+
checksum: 10c0/c41de79311eea8a10c40a982e648d374a3d6cc950318dc2c563fd193455a4e972a6f552777c15d282eb8282e77f8e9fe0e2d95a28310e579b3322103e4836c4d
32193213
languageName: node
32203214
linkType: hard
32213215

@@ -3820,6 +3814,13 @@ __metadata:
38203814
languageName: node
38213815
linkType: hard
38223816

3817+
"@types/prop-types@npm:^15.7.14":
3818+
version: 15.7.14
3819+
resolution: "@types/prop-types@npm:15.7.14"
3820+
checksum: 10c0/1ec775160bfab90b67a782d735952158c7e702ca4502968aa82565bd8e452c2de8601c8dfe349733073c31179116cf7340710160d3836aa8a1ef76d1532893b1
3821+
languageName: node
3822+
linkType: hard
3823+
38233824
"@types/react-dom@npm:<18.0.0":
38243825
version: 17.0.25
38253826
resolution: "@types/react-dom@npm:17.0.25"
@@ -3829,7 +3830,7 @@ __metadata:
38293830
languageName: node
38303831
linkType: hard
38313832

3832-
"@types/react-transition-group@npm:^4.4.10, @types/react-transition-group@npm:^4.4.5":
3833+
"@types/react-transition-group@npm:^4.4.10":
38333834
version: 4.4.10
38343835
resolution: "@types/react-transition-group@npm:4.4.10"
38353836
dependencies:
@@ -3838,6 +3839,15 @@ __metadata:
38383839
languageName: node
38393840
linkType: hard
38403841

3842+
"@types/react-transition-group@npm:^4.4.11":
3843+
version: 4.4.12
3844+
resolution: "@types/react-transition-group@npm:4.4.12"
3845+
peerDependencies:
3846+
"@types/react": "*"
3847+
checksum: 10c0/0441b8b47c69312c89ec0760ba477ba1a0808a10ceef8dc1c64b1013ed78517332c30f18681b0ec0b53542731f1ed015169fed1d127cc91222638ed955478ec7
3848+
languageName: node
3849+
linkType: hard
3850+
38413851
"@types/react@npm:*":
38423852
version: 18.2.75
38433853
resolution: "@types/react@npm:18.2.75"
@@ -4714,7 +4724,7 @@ __metadata:
47144724
languageName: node
47154725
linkType: hard
47164726

4717-
"clsx@npm:^1.0.4, clsx@npm:^1.2.1":
4727+
"clsx@npm:^1.0.4":
47184728
version: 1.2.1
47194729
resolution: "clsx@npm:1.2.1"
47204730
checksum: 10c0/34dead8bee24f5e96f6e7937d711978380647e936a22e76380290e35486afd8634966ce300fc4b74a32f3762c7d4c0303f442c3e259f4ce02374eb0c82834f27
@@ -9679,6 +9689,13 @@ __metadata:
96799689
languageName: node
96809690
linkType: hard
96819691

9692+
"react-is@npm:^19.0.0":
9693+
version: 19.0.0
9694+
resolution: "react-is@npm:19.0.0"
9695+
checksum: 10c0/d1be8e8500cf04f76df71942a21ef3a71266397a383d7ec8885f35190df818d35c65efd35aed7be47a89ad99aaff2c52e0c4e39e8930844a6b997622e50625a8
9696+
languageName: node
9697+
linkType: hard
9698+
96829699
"react-lifecycles-compat@npm:^3.0.4":
96839700
version: 3.0.4
96849701
resolution: "react-lifecycles-compat@npm:3.0.4"
@@ -10001,15 +10018,6 @@ __metadata:
1000110018
languageName: node
1000210019
linkType: hard
1000310020

10004-
"rifm@npm:^0.12.1":
10005-
version: 0.12.1
10006-
resolution: "rifm@npm:0.12.1"
10007-
peerDependencies:
10008-
react: ">=16.8"
10009-
checksum: 10c0/cdf158bbe2a921aaaa9858d8335b32723d1d3aba47e46a98165250a7656133cd910f995d9aabde13c159a4ba3a6a9ea902da78a4f48e9e916b4771465acd4831
10010-
languageName: node
10011-
linkType: hard
10012-
1001310021
"rimraf@npm:^3.0.2":
1001410022
version: 3.0.2
1001510023
resolution: "rimraf@npm:3.0.2"

0 commit comments

Comments
 (0)