From 211a3b9a3945037ad6cb85ce4f7337207c801bca Mon Sep 17 00:00:00 2001 From: MathieuG-P Date: Mon, 6 Feb 2023 21:37:17 +0100 Subject: [PATCH] disable support button + fix button hightlight even if disabled + fix click exec even if disabled --- src/renderer/components/shared/bsm-button.component.tsx | 8 +++++--- src/renderer/pages/settings-page.component.tsx | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/shared/bsm-button.component.tsx b/src/renderer/components/shared/bsm-button.component.tsx index 4671a62f..fb95f172 100644 --- a/src/renderer/components/shared/bsm-button.component.tsx +++ b/src/renderer/components/shared/bsm-button.component.tsx @@ -1,5 +1,5 @@ import { BsmIcon, BsmIconType } from "../svgs/bsm-icon.component" -import { useRef, CSSProperties } from "react"; +import { useRef, CSSProperties, MouseEvent } from "react"; import { BsmImage } from "./bsm-image.component"; import { useTranslation } from "renderer/hooks/use-translation.hook"; import { useClickOutside } from "renderer/hooks/use-click-outside.hook"; @@ -45,15 +45,17 @@ export function BsmButton({className, style, imgClassName, iconClassName, icon, const renderTypeColor = (() => { if(typeColor === "primary"){ return ""; } - if(!typeColor){ return `bg-light-main-color-2 dark:bg-main-color-2 ${!withBar && "hover:brightness-125"}`; } + if(!typeColor){ return `bg-light-main-color-2 dark:bg-main-color-2 ${(!withBar && !disabled) && "hover:brightness-125"}`; } if(typeColor === "cancel"){ return "bg-gray-500"; } if(typeColor === "error"){ return "bg-red-500"; } if(typeColor === "success"){ return "bg-green-500"; } return ""; })(); + const handleClick = (e: MouseEvent) => !disabled && onClick(e); + return ( -
+
{ image && } { icon && } {text && (type === "submit" ? : {t(text)})} diff --git a/src/renderer/pages/settings-page.component.tsx b/src/renderer/pages/settings-page.component.tsx index d20c5adb..f99d6183 100644 --- a/src/renderer/pages/settings-page.component.tsx +++ b/src/renderer/pages/settings-page.component.tsx @@ -293,7 +293,7 @@ export function SettingsPage() {
- +