Skip to content

Commit e21c847

Browse files
author
mcmcphillips
committedOct 11, 2023
update to use utc from adapter
1 parent 7ccc519 commit e21c847

File tree

3 files changed

+34
-12
lines changed

3 files changed

+34
-12
lines changed
 

‎react/components/DateTimeField/DateTimeField.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { FormControl } from "@mui/material";
1111
import { kebabCase } from "lodash";
1212

1313
dayjs.extend(utc)
14+
dayjs.utc();
1415
export const dateTimeTextFieldStyle = {
1516
width: "240px",
1617
borderRadius: "3px",
@@ -55,7 +56,7 @@ const DateTimeField = ({ label, dateTimeValue, handleDateTimeChange,disabled })
5556
{`${label}`}
5657
</InputLabel>
5758
<DateTimePicker
58-
value={dateTimeValue ? dateTimeValue : null}
59+
value={dateTimeValue ? dayjs.utc(dateTimeValue) : null}
5960
onChange={handleDateTimeChange}
6061
views={["year", "day", "hours", "minutes"]}
6162
disabled={disabled}

‎react/package-lock.json

+28-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎react/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@madie/madie-design-system",
3-
"version": "1.0.57",
3+
"version": "1.0.58",
44
"description": "Shared style guide across the Madie program.",
55
"main": "dist/index.js",
66
"homepage": "https://github.com/MeasureAuthoringTool/madie-design-system",
@@ -110,7 +110,6 @@
110110
"@mui/material": "^5.2.5",
111111
"@mui/styles": "^5.5.1",
112112
"@mui/system": "^5.5.2",
113-
"@mui/x-date-pickers": "^6.6.0",
114113
"@reach/portal": "^0.16.2",
115114
"@reach/tooltip": "^0.16.2",
116115
"@testing-library/jest-dom": "^5.16.2",
@@ -119,7 +118,6 @@
119118
"axios": "^0.24.0",
120119
"cookie": "^0.4.1",
121120
"cross-env": "^7.0.3",
122-
"dayjs": "^1.11.7",
123121
"d3-selection": "^1.4.2",
124122
"d3-shape": "^1.3.7",
125123
"jwt-decode": "^3.1.2",
@@ -133,7 +131,9 @@
133131
"xss": "^1.0.10"
134132
},
135133
"peerDependencies": {
136-
"classnames": "^2.3.1"
134+
"@mui/x-date-pickers": "^6.6.0",
135+
"classnames": "^2.3.1",
136+
"dayjs": "^1.11.7"
137137
},
138138
"overrides": {
139139
"trim": ">=0.0.3",

0 commit comments

Comments
 (0)
Please sign in to comment.