brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

got rid of render order error

Browse source
This commit is contained in:
Carter 2025-11-10 12:49:22 -06:00
parent 7c6f592997
commit 6143e0aba1
2 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/common/ObjectControls.tsx
View file

@ -34,14 +34,14 @@ interface Props {
} }
const useStyles = makeStyles((theme: Theme) => ({ const useStyles = makeStyles((theme: Theme) => ({
avatar: { avatar: {
color: useThemeType() === "light" ? theme.palette.common.black : theme.palette.common.white, color: theme.palette.mode === "light" ? theme.palette.common.black : theme.palette.common.white,
backgroundColor: "transparent", backgroundColor: "transparent",
width: theme.spacing(5), width: theme.spacing(5),
height: theme.spacing(5), height: theme.spacing(5),
border: "1px solid", border: "1px solid",
borderColor: theme.palette.divider borderColor: theme.palette.divider
} }
})); }));
export default function ObjectControls(props: Props) { export default function ObjectControls(props: Props) {
@ -215,4 +215,4 @@ export default function ObjectControls(props: Props) {
</Grid> </Grid>
</Box> </Box>
); );
} }

47
src/pages/Contract.tsx
View file

@ -52,31 +52,28 @@ function TabPanelMine(props: TabPanelProps) {
); );
} }
const useStyles = makeStyles((theme: Theme) => { const useStyles = makeStyles((theme: Theme) => ({
const themeType = useThemeType(); inactiveButton: {
return ({ color: theme.palette.mode === "light" ? theme.palette.common.black : theme.palette.common.white,
inactiveButton: { backgroundColor: "transparent",
color: themeType === "light" ? theme.palette.common.black : theme.palette.common.white, width: theme.spacing(5),
backgroundColor: "transparent", height: theme.spacing(5),
width: theme.spacing(5), border: "1px solid",
height: theme.spacing(5), borderColor: theme.palette.divider
border: "1px solid", },
borderColor: theme.palette.divider activeButton: {
}, color: theme.palette.mode === "light" ? theme.palette.common.black : theme.palette.common.white,
activeButton: { backgroundColor: theme.palette.primary.main,
color: themeType === "light" ? theme.palette.common.black : theme.palette.common.white, width: theme.spacing(5),
backgroundColor: theme.palette.primary.main, height: theme.spacing(5),
width: theme.spacing(5), border: "1px solid",
height: theme.spacing(5), borderColor: theme.palette.divider
border: "1px solid", },
borderColor: theme.palette.divider drawerPaper: {
}, height: "100%",
drawerPaper: { width: "30%"
height: "100%", }
width: "30%" }));
}
});
});
export default function Contract() { export default function Contract() {
// const match = useRouteMatch<MatchParams>(); // const match = useRouteMatch<MatchParams>();