From 696e35582c20e19cfb817efde6b354481bdfc683 Mon Sep 17 00:00:00 2001
From: adroitwhiz <adroitwhiz@protonmail.com>
Date: Mon, 6 Jul 2020 17:27:46 -0400
Subject: [PATCH] Add GradientToolsModes for shouldShowGradientTools

This means that gradient tools will also be enabled for the stroke color
indicator even in fill and bitmap modes, but that's okay because the
stroke color indicator will be disabled or hidden in those modes anyway.
---
 src/containers/fill-color-indicator.jsx   | 12 ++----------
 src/containers/stroke-color-indicator.jsx |  9 ++-------
 src/lib/modes.js                          | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/containers/fill-color-indicator.jsx b/src/containers/fill-color-indicator.jsx
index f3704276..fc86f31f 100644
--- a/src/containers/fill-color-indicator.jsx
+++ b/src/containers/fill-color-indicator.jsx
@@ -7,7 +7,7 @@ import {changeGradientType} from '../reducers/fill-mode-gradient-type';
 import {openFillColor, closeFillColor} from '../reducers/modals';
 import {getSelectedLeafItems} from '../helper/selection';
 import {setSelectedItems} from '../reducers/selected-items';
-import Modes from '../lib/modes';
+import Modes, {GradientToolsModes} from '../lib/modes';
 import {isBitmap} from '../lib/format';
 
 import makeColorIndicator from './color-indicator.jsx';
@@ -33,15 +33,7 @@ const mapStateToProps = state => ({
     gradientType: state.scratchPaint.color.fillColor.gradientType,
     isEyeDropping: state.scratchPaint.color.eyeDropper.active,
     mode: state.scratchPaint.mode,
-    shouldShowGradientTools: state.scratchPaint.mode === Modes.SELECT ||
-        state.scratchPaint.mode === Modes.RESHAPE ||
-        state.scratchPaint.mode === Modes.FILL ||
-        state.scratchPaint.mode === Modes.RECT ||
-        state.scratchPaint.mode === Modes.OVAL ||
-        state.scratchPaint.mode === Modes.BIT_SELECT ||
-        state.scratchPaint.mode === Modes.BIT_RECT ||
-        state.scratchPaint.mode === Modes.BIT_OVAL ||
-        state.scratchPaint.mode === Modes.BIT_FILL,
+    shouldShowGradientTools: state.scratchPaint.mode in GradientToolsModes,
     textEditTarget: state.scratchPaint.textEditTarget
 });
 
diff --git a/src/containers/stroke-color-indicator.jsx b/src/containers/stroke-color-indicator.jsx
index 5fafaff1..b912bcc3 100644
--- a/src/containers/stroke-color-indicator.jsx
+++ b/src/containers/stroke-color-indicator.jsx
@@ -8,7 +8,7 @@ import {changeStrokeGradientType} from '../reducers/stroke-style';
 import {openStrokeColor, closeStrokeColor} from '../reducers/modals';
 import {getSelectedLeafItems} from '../helper/selection';
 import {setSelectedItems} from '../reducers/selected-items';
-import Modes from '../lib/modes';
+import Modes, {GradientToolsModes} from '../lib/modes';
 import {isBitmap} from '../lib/format';
 
 import makeColorIndicator from './color-indicator.jsx';
@@ -36,12 +36,7 @@ const mapStateToProps = state => ({
     gradientType: state.scratchPaint.color.strokeColor.gradientType,
     isEyeDropping: state.scratchPaint.color.eyeDropper.active,
     mode: state.scratchPaint.mode,
-    shouldShowGradientTools: state.scratchPaint.mode === Modes.SELECT ||
-        state.scratchPaint.mode === Modes.RESHAPE ||
-        state.scratchPaint.mode === Modes.RECT ||
-        state.scratchPaint.mode === Modes.OVAL ||
-        state.scratchPaint.mode === Modes.BIT_RECT ||
-        state.scratchPaint.mode === Modes.BIT_OVAL,
+    shouldShowGradientTools: state.scratchPaint.mode in GradientToolsModes,
     textEditTarget: state.scratchPaint.textEditTarget
 });
 
diff --git a/src/lib/modes.js b/src/lib/modes.js
index 48e9017c..dc7145ad 100644
--- a/src/lib/modes.js
+++ b/src/lib/modes.js
@@ -26,8 +26,22 @@ const VectorModes = keyMirror(vectorModesObj);
 const BitmapModes = keyMirror(bitmapModesObj);
 const Modes = keyMirror({...vectorModesObj, ...bitmapModesObj});
 
+const GradientToolsModes = keyMirror({
+    FILL: null,
+    SELECT: null,
+    RESHAPE: null,
+    OVAL: null,
+    RECT: null,
+
+    BIT_OVAL: null,
+    BIT_RECT: null,
+    BIT_SELECT: null,
+    BIT_FILL: null
+});
+
 export {
     Modes as default,
     VectorModes,
-    BitmapModes
+    BitmapModes,
+    GradientToolsModes
 };