diff --git a/src/custom/Stepper/index.tsx b/src/custom/Stepper/index.tsx index 3ecaa8440..f49b99dba 100644 --- a/src/custom/Stepper/index.tsx +++ b/src/custom/Stepper/index.tsx @@ -1,8 +1,9 @@ -import { Box, IconProps, Stack, Step, StepConnector, StepLabel, Stepper } from '@mui/material'; +import { Box, Stack, Step, StepConnector, StepLabel, Stepper, useTheme } from '@mui/material'; import { stepConnectorClasses } from '@mui/material/StepConnector'; import { StepIconProps } from '@mui/material/StepIcon'; import { styled } from '@mui/system'; import React, { useMemo, useState } from 'react'; +import { IconProps } from '../../icons/types'; interface ColorlibStepIconPropsI extends StepIconProps { icons: React.ComponentType[]; @@ -23,6 +24,7 @@ interface CustomizedStepperPropsI { stepLabels: string[]; children: React.ReactNode; icons: React.ComponentType[]; + ContentWrapper?: React.ComponentType; } interface UseStepperI { @@ -100,9 +102,10 @@ function ColorlibStepIcon(props: ColorlibStepIconPropsI) { const { active, completed, className, icons } = props; const Icon = icons[Number(props.icon) - 1]; + const theme = useTheme(); return ( - {Icon ? : null} + {Icon ? : null} ); } @@ -111,11 +114,18 @@ const CustomizedStepper: React.FC = ({ stepLabels, activeStep, children, - icons + icons, + ContentWrapper = StepContentWrapper }) => { + const theme = useTheme(); + return ( - - + + }> {stepLabels.map((label) => ( @@ -128,7 +138,7 @@ const CustomizedStepper: React.FC = ({ ))} - {children} + {children} ); }; diff --git a/src/icons/Add/AddIcon.tsx b/src/icons/Add/AddIcon.tsx index b2524af8c..563551257 100644 --- a/src/icons/Add/AddIcon.tsx +++ b/src/icons/Add/AddIcon.tsx @@ -16,8 +16,7 @@ export const AddIcon = ({ data-testid="add-icon-svg" {...props} > - - + ); }; diff --git a/src/theme/index.tsx b/src/theme/index.tsx index 975bb88e0..e054fbd42 100644 --- a/src/theme/index.tsx +++ b/src/theme/index.tsx @@ -1,3 +1,5 @@ +import { styled, useTheme } from '@mui/material'; + export { darkModePalette, lightModePalette } from './palette'; export { typography } from './typography'; @@ -6,3 +8,5 @@ export { SistentThemeProviderWithoutBaseLine } from './ThemeProvider'; export * from './colors'; + +export { styled, useTheme }; diff --git a/src/theme/theme.ts b/src/theme/theme.ts index 369afbfac..76b6dfdd6 100644 --- a/src/theme/theme.ts +++ b/src/theme/theme.ts @@ -16,27 +16,3 @@ export const createCustomTheme = (mode: PaletteMode) => { breakpoints: {} }); }; - -/* - const commonPalette = { - palette: { - paletteType, - ...(paletteType === 'light' ? lightModePalette : darkModePalette) - } - }; - - - const palette = - paletteType === 'dark' - ? { - mode: 'dark', - ...commonPalette, - text: { - main: '#FFFFFF' - } - } - : { - mode: 'light', - ...commonPalette - }; - */