Skip to content

Commit

Permalink
Merge pull request #512 from Arnei/update-dependency-muimaterial
Browse files Browse the repository at this point in the history
Update @mui/material to 5.15.9
  • Loading branch information
lkiesow authored Jun 4, 2024
2 parents df844de + 4a3bbf7 commit 14985c5
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 50 deletions.
76 changes: 38 additions & 38 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage": "/admin-ui",
"dependencies": {
"@hello-pangea/dnd": "^16.5.0",
"@mui/material": "^5.15.6",
"@mui/material": "^5.15.9",
"@mui/styles": "^5.15.19",
"@mui/x-date-pickers": "^6.19.0",
"@reduxjs/toolkit": "^1.9.7",
Expand Down
8 changes: 2 additions & 6 deletions src/components/shared/wizard/CustomStepIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ import { useStepIconStyles } from "../../../utils/wizardUtils";
import cn from "classnames";
import { FaCircle, FaDotCircle } from "react-icons/fa";
import React from "react";

type customStepIconProps = {
active: boolean,
completed: boolean,
}
import { StepIconProps } from "@mui/material";

/**
* Component that renders icons of Stepper depending on completeness of steps
*/
const CustomStepIcon = (props: customStepIconProps) => {
const CustomStepIcon = (props: StepIconProps) => {
const { completed } = props;
const classes = useStepIconStyles(props);

Expand Down
7 changes: 2 additions & 5 deletions src/utils/wizardUtils.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { StepIconProps } from "@mui/material";
import makeStyles from "@mui/styles/makeStyles";

// Base style for Stepper component
Expand All @@ -17,10 +18,6 @@ export const useStepLabelStyles = makeStyles({
});

// Style of icons used in Stepper
type stepIconStyleProps = {
active: boolean,
completed: boolean,
}
export const useStepIconStyles = makeStyles({
root: {
height: 22,
Expand All @@ -30,7 +27,7 @@ export const useStepIconStyles = makeStyles({
color: "#92a0ab",
width: "20px",
height: "20px",
transform: (props: stepIconStyleProps) => props.active ? "scale(1.3)" : "scale(1.0)",
transform: (props: StepIconProps) => props.active ? "scale(1.3)" : "scale(1.0)",
},
});

Expand Down

0 comments on commit 14985c5

Please sign in to comment.