Make style-path helpers generic over fill & stroke

Author: adroitwhiz

src/containers/fill-color-indicator.jsx

@@ -16,7 +16,7 @@ import {isBitmap} from '../lib/format';
 import GradientTypes from '../lib/gradient-types';
 
 import FillColorIndicatorComponent from '../components/fill-color-indicator.jsx';
-import {applyFillColorToSelection,
+import {applyColorToSelection,
     applyGradientTypeToSelection,
     getRotatedColor,
     swapColorsInSelection,
@@ -45,11 +45,12 @@ class FillColorIndicator extends React.Component {
     }
     handleChangeFillColor (newColor) {
         // Apply color and update redux, but do not update svg until picker closes.
-        const isDifferent = applyFillColorToSelection(
+        const isDifferent = applyColorToSelection(
             newColor,
             this.props.colorIndex,
             this.props.gradientType === GradientTypes.SOLID,
             isBitmap(this.props.format),
+            false, // applyToStroke
             this.props.textEditTarget);
         this._hasChanged = this._hasChanged || isDifferent;
         this.props.onChangeFillColor(newColor, this.props.colorIndex);
@@ -59,6 +60,7 @@ class FillColorIndicator extends React.Component {
         const isDifferent = applyGradientTypeToSelection(
             gradientType,
             isBitmap(this.props.format),
+            false, // applyToStroke
             this.props.textEditTarget);
         this._hasChanged = this._hasChanged || isDifferent;
         const hasSelectedItems = getSelectedLeafItems().length > 0;
@@ -92,6 +94,7 @@ class FillColorIndicator extends React.Component {
         if (getSelectedLeafItems().length) {
             const isDifferent = swapColorsInSelection(
                 isBitmap(this.props.format),
+                false, // applyToStroke
                 this.props.textEditTarget);
             this.props.setSelectedItems();
             this._hasChanged = this._hasChanged || isDifferent;

src/containers/stroke-color-indicator.jsx

@@ -10,7 +10,7 @@ import Formats from '../lib/format';
 import {isBitmap} from '../lib/format';
 
 import StrokeColorIndicatorComponent from '../components/stroke-color-indicator.jsx';
-import {applyStrokeColorToSelection, applyStrokeWidthToSelection} from '../helper/style-path';
+import {applyColorToSelection, applyStrokeWidthToSelection} from '../helper/style-path';
 
 class StrokeColorIndicator extends React.Component {
     constructor (props) {
@@ -40,8 +40,13 @@ class StrokeColorIndicator extends React.Component {
             this.props.onChangeStrokeWidth(0);
         }
         // Apply color and update redux, but do not update svg until picker closes.
-        this._hasChanged =
-            applyStrokeColorToSelection(newColor, isBitmap(this.props.format), this.props.textEditTarget) ||
+        this._hasChanged = applyColorToSelection(
+            newColor,
+            0, // colorIndex,
+            true, // isSolidGradient
+            isBitmap(this.props.format),
+            true, // applyToStroke
+            this.props.textEditTarget) ||
             this._hasChanged;
         this.props.onChangeStrokeColor(newColor);
     }

src/containers/stroke-width-indicator.jsx

@@ -7,7 +7,7 @@ import {changeStrokeColor} from '../reducers/stroke-color';
 import {changeStrokeWidth} from '../reducers/stroke-width';
 import StrokeWidthIndicatorComponent from '../components/stroke-width-indicator.jsx';
 import {getSelectedLeafItems} from '../helper/selection';
-import {applyStrokeColorToSelection, applyStrokeWidthToSelection, getColorsFromSelection, MIXED}
+import {applyColorToSelection, applyStrokeWidthToSelection, getColorsFromSelection, MIXED}
     from '../helper/style-path';
 import Modes from '../lib/modes';
 import Formats from '../lib/format';
@@ -25,7 +25,13 @@ class StrokeWidthIndicator extends React.Component {
         if ((!this.props.strokeWidth || this.props.strokeWidth === 0) && newWidth > 0) {
             let currentColor = getColorsFromSelection(getSelectedLeafItems(), isBitmap(this.props.format)).strokeColor;
             if (currentColor === null) {
-                changed = applyStrokeColorToSelection('#000', isBitmap(this.props.format), this.props.textEditTarget) ||
+                changed = applyColorToSelection(
+                    '#000',
+                    0, // colorIndex,
+                    true, // isSolidGradient
+                    isBitmap(this.props.format),
+                    true, // applyToStroke
+                    this.props.textEditTarget) ||
                     changed;
                 currentColor = '#000';
             } else if (currentColor !== MIXED) {