Skip to content

Commit

Permalink
update to use utc from adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmcphillips committed Oct 11, 2023
1 parent 7ccc519 commit e21c847
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 12 deletions.
3 changes: 2 additions & 1 deletion react/components/DateTimeField/DateTimeField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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}
Expand Down
35 changes: 28 additions & 7 deletions react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions react/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -110,7 +110,6 @@
"@mui/material": "^5.2.5",
"@mui/styles": "^5.5.1",
"@mui/system": "^5.5.2",
"@mui/x-date-pickers": "^6.6.0",
"@reach/portal": "^0.16.2",
"@reach/tooltip": "^0.16.2",
"@testing-library/jest-dom": "^5.16.2",
Expand All @@ -119,7 +118,6 @@
"axios": "^0.24.0",
"cookie": "^0.4.1",
"cross-env": "^7.0.3",
"dayjs": "^1.11.7",
"d3-selection": "^1.4.2",
"d3-shape": "^1.3.7",
"jwt-decode": "^3.1.2",
Expand All @@ -133,7 +131,9 @@
"xss": "^1.0.10"
},
"peerDependencies": {
"classnames": "^2.3.1"
"@mui/x-date-pickers": "^6.6.0",
"classnames": "^2.3.1",
"dayjs": "^1.11.7"
},
"overrides": {
"trim": ">=0.0.3",
Expand Down

0 comments on commit e21c847

Please sign in to comment.