fix(@clayui/color-picker): Splotch should use classes provided by Cla…

…y CSS to style borders on light colors and active colors
liferay · Jul 23, 2020 · b426c46 · b426c46
1 parent bc571ea
commit b426c46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/clay-color-picker/package.json b/packages/clay-color-picker/package.json
@@ -30,6 +30,7 @@
 		"@clayui/form": "^3.9.0",
 		"@clayui/icon": "^3.0.5",
 		"@clayui/shared": "^3.2.0",
+		"classnames": "^2.2.6",
 		"tinycolor2": "^1.4.1"
 	},
 	"peerDependencies": {

diff --git a/packages/clay-color-picker/src/Splotch.tsx b/packages/clay-color-picker/src/Splotch.tsx
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+import classNames from 'classnames';
 import React from 'react';
 import tinycolor from 'tinycolor2';
 
@@ -33,13 +34,12 @@ const ClayColorPickerSplotch = React.forwardRef<HTMLButtonElement, IProps>(
 		return (
 			<button
 				{...otherProps}
-				className={`btn clay-color-btn ${className ? className : ''}`}
+				className={classNames('btn clay-color-btn', className, {
+					active,
+					'clay-color-btn-bordered': requireBorder,
+				})}
 				ref={ref}
 				style={{
-					...(active ? {outline: 'auto 3px #55ADFF'} : {}),
-					...(requireBorder
-						? {border: '1px solid #E7E7ED'}
-						: {borderWidth: 0}),
 					background: `#${value}`,
 					height: size,
 					width: size,