Skip to content

Commit a7683fc

Browse files
authoredOct 12, 2023
Merge pull request #193 from MeasureAuthoringTool/MAT-5168-fix
MAT-5168: update to use utc from adapter
2 parents 7ccc519 + 876236d commit a7683fc

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
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

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

‎react/package.json

+1-1
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",

0 commit comments

Comments
 (0)
Please sign in to comment.