Merge pull request #193 from MeasureAuthoringTool/MAT-5168-fix

MAT-5168: update to use utc from adapter
MeasureAuthoringTool · Oct 12, 2023 · a7683fc · a7683fc
2 parents 7ccc519 + 876236d
commit a7683fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/react/components/DateTimeField/DateTimeField.jsx b/react/components/DateTimeField/DateTimeField.jsx
@@ -11,6 +11,7 @@ import { FormControl } from "@mui/material";
 import { kebabCase } from "lodash";
 
 dayjs.extend(utc)
+dayjs.utc();
 export const dateTimeTextFieldStyle = {
     width: "240px",
     borderRadius: "3px",
@@ -55,7 +56,7 @@ const DateTimeField = ({ label, dateTimeValue, handleDateTimeChange,disabled })
                     {`${label}`}
                 </InputLabel>
                 <DateTimePicker
-                    value={dateTimeValue ? dateTimeValue : null}
+                    value={dateTimeValue ? dayjs.utc(dateTimeValue) : null}
                     onChange={handleDateTimeChange}
                     views={["year", "day", "hours", "minutes"]}
                     disabled={disabled}

diff --git a/react/package-lock.json b/react/package-lock.json
diff --git a/react/package.json b/react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@madie/madie-design-system",
-    "version": "1.0.57",
+    "version": "1.0.58",
     "description": "Shared style guide across the Madie program.",
     "main": "dist/index.js",
     "homepage": "https://github.com/MeasureAuthoringTool/madie-design-system",