From 73d52fa0d0528e060a46938194fa70d9c577912c Mon Sep 17 00:00:00 2001
From: Joel Jeremy Marquez <joeljeremy.marquez@gmail.com>
Date: Sat, 27 Jul 2024 13:06:15 -0700
Subject: [PATCH] Fix Button2 isDisabled prop (#3146)
* Fix Button2 isDisabled prop
* Release notes
* Update 3146.md
---
packages/desktop-client/src/components/common/Button2.tsx | 7 ++++++-
upcoming-release-notes/3146.md | 6 ++++++
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 upcoming-release-notes/3146.md
diff --git a/packages/desktop-client/src/components/common/Button2.tsx b/packages/desktop-client/src/components/common/Button2.tsx
index 5c80848b5..78d3d1735 100644
--- a/packages/desktop-client/src/components/common/Button2.tsx
+++ b/packages/desktop-client/src/components/common/Button2.tsx
@@ -171,7 +171,12 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
});
return (
- <ReactAriaButton ref={ref} style={buttonStyle} {...restProps}>
+ <ReactAriaButton
+ ref={ref}
+ isDisabled={isDisabled}
+ style={buttonStyle}
+ {...restProps}
+ >
{children}
</ReactAriaButton>
);
diff --git a/upcoming-release-notes/3146.md b/upcoming-release-notes/3146.md
new file mode 100644
index 000000000..d5ea04ffb
--- /dev/null
+++ b/upcoming-release-notes/3146.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+Fix Button2 isDisabled prop.
--
GitLab