From 3b59bea41e9886092bd8aa65946512ed744c1d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Thu, 28 Dec 2023 14:34:35 +0100 Subject: [PATCH] Remove @mui/styles --- package-lock.json | 142 ------------------ package.json | 1 - .../ParkingItemPayAndRideExpandedFields.js | 38 +++-- src/components/ReportPageV2/StopTypeFilter.js | 29 ++-- 4 files changed, 45 insertions(+), 165 deletions(-) diff --git a/package-lock.json b/package-lock.json index 453cdac92..d755515f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,6 @@ "@mui/icons-material": "5.15.2", "@mui/lab": "5.0.0-alpha.158", "@mui/material": "5.15.2", - "@mui/styles": "5.15.2", "@reduxjs/toolkit": "2.0.1", "@sentry/react": "7.91.0", "@sentry/tracing": "7.91.0", @@ -4823,46 +4822,6 @@ } } }, - "node_modules/@mui/styles": { - "version": "5.15.2", - "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.15.2.tgz", - "integrity": "sha512-B8a3IW/HqAaIWr4wd2CafITT/NOO63X0bQF36WsLCQec9vgRLh6CKLLjDY5pvyEpzJJFYwI7kjUMaNeETpYsXg==", - "dependencies": { - "@babel/runtime": "^7.23.6", - "@emotion/hash": "^0.9.1", - "@mui/private-theming": "^5.15.2", - "@mui/types": "^7.2.11", - "@mui/utils": "^5.15.2", - "clsx": "^2.0.0", - "csstype": "^3.1.2", - "hoist-non-react-statics": "^3.3.2", - "jss": "^10.10.0", - "jss-plugin-camel-case": "^10.10.0", - "jss-plugin-default-unit": "^10.10.0", - "jss-plugin-global": "^10.10.0", - "jss-plugin-nested": "^10.10.0", - "jss-plugin-props-sort": "^10.10.0", - "jss-plugin-rule-value-function": "^10.10.0", - "jss-plugin-vendor-prefixer": "^10.10.0", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mui/system": { "version": "5.15.2", "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.15.2.tgz", @@ -9716,15 +9675,6 @@ "node": ">=0.10.0" } }, - "node_modules/css-vendor": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", - "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", - "dependencies": { - "@babel/runtime": "^7.8.3", - "is-in-browser": "^1.0.2" - } - }, "node_modules/css-what": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", @@ -14140,11 +14090,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-in-browser": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", - "integrity": "sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g==" - }, "node_modules/is-installed-globally": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", @@ -17408,88 +17353,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/jss": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz", - "integrity": "sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "csstype": "^3.0.2", - "is-in-browser": "^1.1.3", - "tiny-warning": "^1.0.2" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/jss" - } - }, - "node_modules/jss-plugin-camel-case": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz", - "integrity": "sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "hyphenate-style-name": "^1.0.3", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-default-unit": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz", - "integrity": "sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-global": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz", - "integrity": "sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-nested": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz", - "integrity": "sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0", - "tiny-warning": "^1.0.2" - } - }, - "node_modules/jss-plugin-props-sort": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz", - "integrity": "sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-rule-value-function": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz", - "integrity": "sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0", - "tiny-warning": "^1.0.2" - } - }, - "node_modules/jss-plugin-vendor-prefixer": { - "version": "10.10.0", - "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz", - "integrity": "sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "css-vendor": "^2.0.8", - "jss": "10.10.0" - } - }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", @@ -25106,11 +24969,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "node_modules/tiny-warning": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" - }, "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", diff --git a/package.json b/package.json index 5721bec95..e8cea6284 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "@mui/icons-material": "5.15.2", "@mui/lab": "5.0.0-alpha.158", "@mui/material": "5.15.2", - "@mui/styles": "5.15.2", "@reduxjs/toolkit": "2.0.1", "@sentry/react": "7.91.0", "@sentry/tracing": "7.91.0", diff --git a/src/components/EditStopPage/ParkingItemPayAndRideExpandedFields.js b/src/components/EditStopPage/ParkingItemPayAndRideExpandedFields.js index a6bc802d0..1807b118a 100644 --- a/src/components/EditStopPage/ParkingItemPayAndRideExpandedFields.js +++ b/src/components/EditStopPage/ParkingItemPayAndRideExpandedFields.js @@ -13,6 +13,7 @@ See the Licence for the specific language governing permissions and limitations under the Licence. */ import React from "react"; +import { styled } from "@mui/material/styles"; import Select from "@mui/material/Select"; import MenuItem from "@mui/material/MenuItem"; import Input from "@mui/material/Input"; @@ -29,25 +30,39 @@ import { ActionAccessible } from "material-ui/svg-icons"; import Payment from "material-ui/svg-icons/action/payment"; import Box from "@mui/material/Box"; import { Grid } from "@mui/material"; -import { makeStyles } from "@mui/styles"; +const PREFIX = "ParkingItemPayAndRideExpandedFields"; -const useStyles = makeStyles(() => ({ - mainGrid: { +const classes = { + mainGrid: `${PREFIX}-mainGrid`, + gridItemMargin: `${PREFIX}-gridItemMargin`, + boxFullWidth: `${PREFIX}-boxFullWidth`, + textField: `${PREFIX}-textField`, + selectInput: `${PREFIX}-selectInput`, + info: `${PREFIX}-info`, +}; + +const StyledGrid = styled(Grid)(() => ({ + [`&.${classes.mainGrid}`]: { marginTop: ".5rem", }, - gridItemMargin: { + + [`& .${classes.gridItemMargin}`]: { marginLeft: "55px", }, - boxFullWidth: { + + [`& .${classes.boxFullWidth}`]: { width: "100%", }, - textField: { + + [`& .${classes.textField}`]: { marginTop: -10, }, - selectInput: { + + [`& .${classes.selectInput}`]: { width: "100%", }, - info: { + + [`& .${classes.info}`]: { color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", paddingLeft: "16px", @@ -57,7 +72,6 @@ const useStyles = makeStyles(() => ({ })); const Info = ({ children }) => { - const classes = useStyles(); return

{children}

; }; @@ -105,10 +119,8 @@ const ParkingItemPayAndRideExpandedFields = (props) => { handleSetNumberOfSpacesForRegisteredDisabledUserType, } = props; - const classes = useStyles(); - return ( - { /> - + ); }; diff --git a/src/components/ReportPageV2/StopTypeFilter.js b/src/components/ReportPageV2/StopTypeFilter.js index 0518cd1c1..da4c33ec4 100644 --- a/src/components/ReportPageV2/StopTypeFilter.js +++ b/src/components/ReportPageV2/StopTypeFilter.js @@ -1,5 +1,5 @@ import React from "react"; -import { makeStyles } from "@mui/styles"; +import { styled } from "@mui/material/styles"; import { injectIntl } from "react-intl"; import Input from "@mui/material/Input"; import InputLabel from "@mui/material/InputLabel"; @@ -12,20 +12,32 @@ import Select from "@mui/material/Select"; import stopTypes from "../../models/stopTypes"; import ModalityIconSvg from "../MainPage/ModalityIconSvg"; -const useStyles = makeStyles((theme) => ({ - formControl: { +const PREFIX = "StopTypeFilter"; + +const classes = { + formControl: `${PREFIX}-formControl`, + chips: `${PREFIX}-chips`, + chip: `${PREFIX}-chip`, + noLabel: `${PREFIX}-noLabel`, +}; + +const StyledFormControl = styled(FormControl)(({ theme }) => ({ + [`&.${classes.formControl}`]: { //margin: theme.spacing(1), minWidth: 300, maxWidth: 500, }, - chips: { + + [`& .${classes.chips}`]: { display: "flex", flexWrap: "wrap", }, - chip: { + + [`& .${classes.chip}`]: { margin: 2, }, - noLabel: { + + [`& .${classes.noLabel}`]: { marginTop: theme.spacing(3), }, })); @@ -42,11 +54,10 @@ const MenuProps = { }; const StopTypeFilter = ({ intl: { formatMessage }, value, onChange }) => { - const classes = useStyles(); const modalities = Object.keys(stopTypes); return ( - + Modality filter - + ); };