From 8e5b69164aa8ab61592d07dc22a2119347ac1f5c Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Mon, 7 Oct 2019 08:49:05 -0700
Subject: [PATCH] Grey-out disabled buttons

Summary:
For "primary" and "danger" buttons, you previously couldn't see any difference between disabled and enabled ones.
This fixes that by greying them out when disabled.

Reviewed By: passy

Differential Revision: D17738031

fbshipit-source-id: 82e16b8881f3d404aafae8a7837151090bb6bbee
---
 src/ui/components/Button.tsx | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/ui/components/Button.tsx b/src/ui/components/Button.tsx
index 0e32b14f8..58f1303da 100644
--- a/src/ui/components/Button.tsx
+++ b/src/ui/components/Button.tsx
@@ -20,14 +20,15 @@ type ButtonType = 'primary' | 'success' | 'warning' | 'danger';
 
 const borderColor = (props: {
   windowIsFocused?: boolean;
+  disabled?: boolean;
   type?: ButtonType;
   depressed?: boolean;
 }) => {
   if (!props.windowIsFocused) {
     return colors.macOSTitleBarButtonBorderBlur;
-  } else if (props.type === 'danger') {
+  } else if (props.type === 'danger' && !props.disabled) {
     return colors.red;
-  } else if (props.type === 'primary') {
+  } else if (props.type === 'primary' && !props.disabled) {
     return '#237FF1';
   } else if (props.depressed) {
     return colors.macOSTitleBarButtonBorderBottom;
@@ -37,14 +38,15 @@ const borderColor = (props: {
 };
 const borderBottomColor = (props: {
   windowIsFocused?: boolean;
+  disabled?: boolean;
   type?: ButtonType;
   depressed?: boolean;
 }) => {
   if (!props.windowIsFocused) {
     return colors.macOSTitleBarButtonBorderBlur;
-  } else if (props.type === 'danger') {
+  } else if (props.type === 'danger' && !props.disabled) {
     return colors.red;
-  } else if (props.type === 'primary') {
+  } else if (props.type === 'primary' && !props.disabled) {
     return '#237FF1';
   } else {
     return colors.macOSTitleBarButtonBorderBottom;
@@ -53,10 +55,11 @@ const borderBottomColor = (props: {
 
 const backgroundImage = (props: {
   windowIsFocused?: boolean;
+  disabled?: boolean;
   type?: ButtonType;
   depressed?: boolean;
 }) => {
-  if (props.windowIsFocused) {
+  if (props.windowIsFocused && !props.disabled) {
     if (props.depressed) {
       return `linear-gradient(to bottom, ${
         colors.macOSTitleBarBorderBlur
@@ -80,9 +83,13 @@ const color = (props: {
   type?: ButtonType;
   disabled?: boolean;
 }) => {
-  if (props.type === 'danger' && props.windowIsFocused) {
+  if (props.type === 'danger' && props.windowIsFocused && !props.disabled) {
     return colors.red;
-  } else if (props.type === 'primary' && props.windowIsFocused) {
+  } else if (
+    props.type === 'primary' &&
+    props.windowIsFocused &&
+    !props.disabled
+  ) {
     return colors.white;
   } else if (props.disabled) {
     return colors.macOSTitleBarIconBlur;
@@ -113,9 +120,10 @@ const StyledButton = styled('div')(
     disabled?: boolean;
     dropdown?: Array<MenuItemConstructorOptions>;
   }) => ({
-    backgroundColor: !props.windowIsFocused
-      ? colors.macOSTitleBarButtonBackgroundBlur
-      : colors.white,
+    backgroundColor:
+      props.windowIsFocused && !props.disabled
+        ? colors.white
+        : colors.macOSTitleBarButtonBackgroundBlur,
     backgroundImage: backgroundImage(props),
     borderStyle: 'solid',
     borderWidth: 1,