Skip to content

Migrate Button component from Antd to MUI #1804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thesocialdev merged 1 commit into from
Feb 5, 2025
Merged

Migrate Button component from Antd to MUI #1804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/components/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button, ButtonProps } from "antd";
import { Button, ButtonProps } from "@mui/material";
import colors from "../styles/colors";
import { useAtom } from "jotai";
import { currentNameSpace } from "../atoms/namespace";
Expand All @@ -19,14 +19,19 @@ interface IAletheiaButtonProps extends AletheiaButtonProps {
type?: ButtonType;
event?: any;
rounded?: string;
loading?: boolean;
htmlType?: "button" | "submit" | "reset";
icon?: any;
target?: "_blank" | "_self" | "_parent" | "_top";
}

const AletheiaButton: (props: IAletheiaButtonProps) => JSX.Element = (
props: IAletheiaButtonProps
) => {
const AletheiaButton: React.FC<IAletheiaButtonProps> = (props) => {
const { children, type, rounded, htmlType, style, ...restProps } = props;

const [nameSpace] = useAtom(currentNameSpace);

const [backgroundColor, setBackgroundColor] = useState(colors.primary);

useLayoutEffect(() => {
setBackgroundColor(
nameSpace === NameSpaceEnum.Main
Expand Down Expand Up @@ -98,8 +103,8 @@ const AletheiaButton: (props: IAletheiaButtonProps) => JSX.Element = (
}

return (
<Button {...props} type="default" style={buttonStyle}>
{props.children}
<Button type={htmlType || "button"} variant="outlined" style={buttonStyle} {...restProps}>
{children}
</Button>
);
};
Expand Down
Loading