From de4e90f5643af86f127a7540a3c262084d413bbf Mon Sep 17 00:00:00 2001 From: Bryce Osterhaus Date: Thu, 28 Jan 2021 12:38:47 -0800 Subject: [PATCH] feat(@clayui/color-picker): update markup for hybrid color-picker --- packages/clay-color-picker/src/Basic.tsx | 8 +- packages/clay-color-picker/src/Custom.tsx | 8 +- packages/clay-color-picker/src/Splotch.tsx | 8 +- .../__tests__/__snapshots__/index.tsx.snap | 140 +++++++++--------- 4 files changed, 91 insertions(+), 73 deletions(-) diff --git a/packages/clay-color-picker/src/Basic.tsx b/packages/clay-color-picker/src/Basic.tsx index 46cdf60179..63b10ecc5e 100644 --- a/packages/clay-color-picker/src/Basic.tsx +++ b/packages/clay-color-picker/src/Basic.tsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ +import classNames from 'classnames'; import React from 'react'; import Splotch from './Splotch'; @@ -41,7 +42,12 @@ const ClayColorPickerBasic: React.FunctionComponent = ({
{colors.map((hex, i) => ( -
+
= 20, + })} + key={i} + > onChange(hex)} value={hex} />
))} diff --git a/packages/clay-color-picker/src/Custom.tsx b/packages/clay-color-picker/src/Custom.tsx index 26ea3e7b48..cdaf81e38a 100644 --- a/packages/clay-color-picker/src/Custom.tsx +++ b/packages/clay-color-picker/src/Custom.tsx @@ -6,6 +6,7 @@ import ClayForm, {ClayInput} from '@clayui/form'; import Icon from '@clayui/icon'; import {TInternalStateOnChange, useInternalState} from '@clayui/shared'; +import classNames from 'classnames'; import React from 'react'; import tinycolor from 'tinycolor2'; @@ -196,7 +197,12 @@ const ClayColorPickerCustom: React.FunctionComponent = ({ {showPalette && (
{colors.map((hex, i) => ( -
+
= 6, + })} + key={i} + > { diff --git a/packages/clay-color-picker/src/Splotch.tsx b/packages/clay-color-picker/src/Splotch.tsx index 4c11c2fbf4..36de82a881 100644 --- a/packages/clay-color-picker/src/Splotch.tsx +++ b/packages/clay-color-picker/src/Splotch.tsx @@ -23,13 +23,18 @@ interface IProps extends React.ButtonHTMLAttributes { * The hex value of the splotch color */ value: string; + + /** + * Adds class `clay-color-swatch-item-last-row` + */ + last?: boolean; } /** * Renders component that displays a color */ const ClayColorPickerSplotch = React.forwardRef( - ({active, className, size, value, ...otherProps}, ref) => { + ({active, className, last, size, value, ...otherProps}, ref) => { const color = tinycolor(value); const isHex = (color.getFormat() || '').match('hex'); @@ -43,6 +48,7 @@ const ClayColorPickerSplotch = React.forwardRef( className={classNames('clay-color-btn', className, { active, 'clay-color-btn-bordered': requireBorder, + 'clay-color-swatch-item-last-row': last, })} displayType={null} ref={ref} diff --git a/packages/clay-color-picker/src/__tests__/__snapshots__/index.tsx.snap b/packages/clay-color-picker/src/__tests__/__snapshots__/index.tsx.snap index 286cbe2cc0..bc9dc57948 100644 --- a/packages/clay-color-picker/src/__tests__/__snapshots__/index.tsx.snap +++ b/packages/clay-color-picker/src/__tests__/__snapshots__/index.tsx.snap @@ -324,7 +324,7 @@ exports[`Rendering default 1`] = ` />