From b174bcdb69d0e7ceafd395b9a97ca7cfa9f7b78d Mon Sep 17 00:00:00 2001
From: Austin Green <austingreenkansas@gmail.com>
Date: Tue, 16 Oct 2018 09:47:54 -0700
Subject: [PATCH 1/2] fix(buttons): disable danger styling if disabled

---
 packages/buttons/src/views/Button.js          |  2 +-
 packages/buttons/src/views/Button.spec.js     |  6 ++
 .../views/__snapshots__/Button.spec.js.snap   | 62 +++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/packages/buttons/src/views/Button.js b/packages/buttons/src/views/Button.js
index dba00ab4233..c95b4fc0d6e 100644
--- a/packages/buttons/src/views/Button.js
+++ b/packages/buttons/src/views/Button.js
@@ -40,7 +40,7 @@ const StyledButton = styled.button.attrs({
   }) =>
     classNames(ButtonStyles['c-btn'], {
       // Danger styling
-      [ButtonStyles['c-btn--danger']]: danger,
+      [ButtonStyles['c-btn--danger']]: !disabled && danger,
 
       // Styles
       [ButtonStyles['c-btn--primary']]: primary,
diff --git a/packages/buttons/src/views/Button.spec.js b/packages/buttons/src/views/Button.spec.js
index 0a117f4039a..40738ba8572 100644
--- a/packages/buttons/src/views/Button.spec.js
+++ b/packages/buttons/src/views/Button.spec.js
@@ -22,6 +22,12 @@ describe('Button', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
+  it('renders correct combination of danger and disabled styling if provided', () => {
+    const wrapper = mount(<Button danger disabled />);
+
+    expect(wrapper).toMatchSnapshot();
+  });
+
   it('renders stretched styling if provided', () => {
     const wrapper = mount(<Button stretched />);
 
diff --git a/packages/buttons/src/views/__snapshots__/Button.spec.js.snap b/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
index e7c502996b2..43491918748 100644
--- a/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
+++ b/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
@@ -340,6 +340,37 @@ exports[`Button Types renders primary styling if provided 1`] = `
 </Button>
 `;
 
+exports[`Button renders correct combination of danger and disabled styling if provided 1`] = `
+<Button
+  danger={true}
+  disabled={true}
+>
+  <KeyboardFocusContainer>
+    <Button__StyledButton
+      danger={true}
+      disabled={true}
+      focused={false}
+      onBlur={[Function]}
+      onFocus={[Function]}
+      onMouseDown={[Function]}
+      tabIndex={0}
+    >
+      <button
+        className="c-btn is-disabled "
+        data-garden-id="buttons.button"
+        data-garden-version="version"
+        disabled={true}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseDown={[Function]}
+        tabIndex={0}
+        type="button"
+      />
+    </Button__StyledButton>
+  </KeyboardFocusContainer>
+</Button>
+`;
+
 exports[`Button renders danger styling if provided 1`] = `
 <Button
   danger={true}
@@ -393,6 +424,37 @@ exports[`Button renders default styling 1`] = `
 </Button>
 `;
 
+exports[`Button renders disabled styling if provided with danger styling 1`] = `
+<Button
+  danger={true}
+  disabled={true}
+>
+  <KeyboardFocusContainer>
+    <Button__StyledButton
+      danger={true}
+      disabled={true}
+      focused={false}
+      onBlur={[Function]}
+      onFocus={[Function]}
+      onMouseDown={[Function]}
+      tabIndex={0}
+    >
+      <button
+        className="c-btn is-disabled "
+        data-garden-id="buttons.button"
+        data-garden-version="version"
+        disabled={true}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseDown={[Function]}
+        tabIndex={0}
+        type="button"
+      />
+    </Button__StyledButton>
+  </KeyboardFocusContainer>
+</Button>
+`;
+
 exports[`Button renders stretched styling if provided 1`] = `
 <Button
   stretched={true}

From fbe5e333947f3ac4378f1dac5e75dd72c2d9f84c Mon Sep 17 00:00:00 2001
From: Austin Green <austingreenkansas@gmail.com>
Date: Tue, 16 Oct 2018 11:25:24 -0700
Subject: [PATCH 2/2] Update snapshots

---
 .../views/__snapshots__/Button.spec.js.snap   | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/packages/buttons/src/views/__snapshots__/Button.spec.js.snap b/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
index 43491918748..39f0822c782 100644
--- a/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
+++ b/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
@@ -424,37 +424,6 @@ exports[`Button renders default styling 1`] = `
 </Button>
 `;
 
-exports[`Button renders disabled styling if provided with danger styling 1`] = `
-<Button
-  danger={true}
-  disabled={true}
->
-  <KeyboardFocusContainer>
-    <Button__StyledButton
-      danger={true}
-      disabled={true}
-      focused={false}
-      onBlur={[Function]}
-      onFocus={[Function]}
-      onMouseDown={[Function]}
-      tabIndex={0}
-    >
-      <button
-        className="c-btn is-disabled "
-        data-garden-id="buttons.button"
-        data-garden-version="version"
-        disabled={true}
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        tabIndex={0}
-        type="button"
-      />
-    </Button__StyledButton>
-  </KeyboardFocusContainer>
-</Button>
-`;
-
 exports[`Button renders stretched styling if provided 1`] = `
 <Button
   stretched={true}