diff --git a/src/front/Components/DesignSystem/Button/classes.module.scss b/src/front/Components/DesignSystem/Button/classes.module.scss index d367db76..9beda2dd 100644 --- a/src/front/Components/DesignSystem/Button/classes.module.scss +++ b/src/front/Components/DesignSystem/Button/classes.module.scss @@ -677,7 +677,8 @@ text-transform: inherit; } - &[disabled="true"] { + &:disabled { opacity: var(--opacity-disabled, 0.3); + pointer-events: none; } } diff --git a/src/front/Components/DesignSystem/Button/index.tsx b/src/front/Components/DesignSystem/Button/index.tsx index 0bdb4974..73f6789b 100644 --- a/src/front/Components/DesignSystem/Button/index.tsx +++ b/src/front/Components/DesignSystem/Button/index.tsx @@ -2,6 +2,7 @@ import classNames from "classnames"; import React from "react"; import classes from "./classes.module.scss"; +import Loader from "../Loader"; export enum EButtonVariant { PRIMARY = "primary", @@ -57,18 +58,23 @@ export default function Button(props: IButtonProps) { } = props; const fullwidthattr = fullwidth.toString(); - const isloadingattr = isLoading.toString(); - const attributes = { ...props, variant, disabled, type, isloadingattr, fullwidthattr, sizing: size, styletype }; + const attributes = { ...props, variant, disabled, type, fullwidthattr, sizing: size, styletype }; delete attributes.fullwidth; delete attributes.leftIcon; delete attributes.rightIcon; + delete attributes.isLoading; return ( - ); } diff --git a/src/front/Components/DesignSystem/Loader/classes.module.scss b/src/front/Components/DesignSystem/Loader/classes.module.scss index 1be2f0b0..0faa120e 100644 --- a/src/front/Components/DesignSystem/Loader/classes.module.scss +++ b/src/front/Components/DesignSystem/Loader/classes.module.scss @@ -5,11 +5,5 @@ } .root { - width: 100%; - height: 100%; - border-radius: 50%; - border: 8px solid; - border-color: var(--color-neutral-50); - border-right-color: var(--color-info-500-soft); animation: s2 1s infinite linear; } diff --git a/src/front/Components/DesignSystem/Loader/index.tsx b/src/front/Components/DesignSystem/Loader/index.tsx index e2e13e26..c2152759 100644 --- a/src/front/Components/DesignSystem/Loader/index.tsx +++ b/src/front/Components/DesignSystem/Loader/index.tsx @@ -1,4 +1,6 @@ +import { ArrowPathIcon } from "@heroicons/react/24/outline"; import React from "react"; + import classes from "./classes.module.scss"; interface IProps { @@ -6,6 +8,6 @@ interface IProps { } export default class Loader extends React.Component { public override render(): JSX.Element { - return
; + return ; } } diff --git a/src/front/Components/DesignSystem/RadioBox/index.tsx b/src/front/Components/DesignSystem/RadioBox/index.tsx index 8653e8de..e856e346 100644 --- a/src/front/Components/DesignSystem/RadioBox/index.tsx +++ b/src/front/Components/DesignSystem/RadioBox/index.tsx @@ -3,6 +3,7 @@ import React from "react"; import Tooltip from "../ToolTip"; import Typography, { ETypo, ETypoColor } from "../Typography"; import classes from "./classes.module.scss"; +import classNames from "classnames"; type IProps = { name: string; @@ -23,7 +24,7 @@ export default class RadioBox extends React.Component { public override render(): JSX.Element { return ( -