@@ -10,8 +10,12 @@ import styles from './color-button.css';
10
10
import GradientTypes from '../../lib/gradient-types' ;
11
11
import log from '../../log/log' ;
12
12
13
+ const isMixed = ( color , color2 , gradientType ) => (
14
+ color === MIXED || ( gradientType !== GradientTypes . SOLID && color2 === MIXED )
15
+ ) ;
16
+
13
17
const colorToBackground = ( color , color2 , gradientType ) => {
14
- if ( color === MIXED || ( gradientType !== GradientTypes . SOLID && color2 === MIXED ) ) return 'white' ;
18
+ if ( isMixed ( color , color2 , gradientType ) ) return 'white' ;
15
19
if ( color === null ) color = 'white' ;
16
20
if ( color2 === null ) color2 = 'white' ;
17
21
switch ( gradientType ) {
@@ -30,7 +34,7 @@ const ColorButtonComponent = props => (
30
34
>
31
35
< div
32
36
className = { classNames ( styles . colorButtonSwatch , {
33
- [ styles . outlineSwatch ] : props . outline && ! ( props . color === MIXED )
37
+ [ styles . outlineSwatch ] : props . outline && ! isMixed ( props . color , props . color2 , props . gradientType )
34
38
} ) }
35
39
style = { {
36
40
background : colorToBackground ( props . color , props . color2 , props . gradientType )
@@ -42,7 +46,7 @@ const ColorButtonComponent = props => (
42
46
draggable = { false }
43
47
src = { noFillIcon }
44
48
/>
45
- ) : ( ( props . color === MIXED || ( props . gradientType !== GradientTypes . SOLID && props . color2 === MIXED ) ? (
49
+ ) : ( ( isMixed ( props . color , props . color2 , props . gradientType ) ? (
46
50
< img
47
51
className = { styles . swatchIcon }
48
52
draggable = { false }
0 commit comments