Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(colorpicker): remove swatchs panel default title #1810

Merged
merged 6 commits into from
Dec 22, 2022
Merged

fix(colorpicker): remove swatchs panel default title #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e14728
feat: add preset&recent when color change
josonyang Nov 18, 2022
2329fc2
Merge branch 'Tencent:develop' into develop
josonyang Nov 23, 2022
03ccad7
Merge branch 'Tencent:develop' into develop
josonyang Dec 15, 2022
5cc8f2a
fix(colorpicker): remove swatches default title
josonyang Dec 15, 2022
9a2f047
Merge branch 'Tencent:develop' into develop
josonyang Dec 15, 2022
fcd8fc5
feat: update common
josonyang Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_common
Open in desktop
Submodule _common updated 9 files
+2 −0 .gitignore
+2 −1 js/global-config/default-config.ts
+5 −5 js/global-config/locale/en_US.ts
+5 −5 js/global-config/locale/ja_JP.ts
+5 −5 js/global-config/locale/ko_KR.ts
+5 −5 js/global-config/locale/zh_CN.ts
+5 −5 style/web/components/dialog/_index.less
+37 −0 style/web/components/menu/_docs.less
+9 −1 style/web/components/menu/_index.less
43 changes: 19 additions & 24 deletions src/color-picker/components/panel/swatches.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,7 @@ export interface TdColorSwathcesProps extends TdColorBaseProps {
}

const Swatches = (props: TdColorSwathcesProps) => {
const {
baseClassName,
colors = [],
title = '系统色彩',
editable = false,
onChange,
disabled,
onSetColor,
handleAddColor,
} = props;
const { baseClassName, colors = [], editable = false, title, onChange, disabled, onSetColor, handleAddColor } = props;
const { DeleteIcon, AddIcon } = useGlobalIcon({ DeleteIcon: TdDeleteIcon, AddIcon: TdAddIcon });
const swatchesClass = `${baseClassName}__swatches`;
const { STATUS: statusClassNames } = useCommonClassName();
Expand All @@ -44,21 +35,25 @@ const Swatches = (props: TdColorSwathcesProps) => {

return (
<div className={swatchesClass}>
<h3 className={`${swatchesClass}--title`}>
<span>{title}</span>
{editable && (
<div className={`${swatchesClass}--actions`}>
<span role="button" className={`${baseClassName}__icon`} onClick={() => handleAddColor()}>
<AddIcon />
</span>
{colors.length > 0 ? (
<span role="button" className={`${baseClassName}__icon`} onClick={() => handleRemoveColor()}>
<DeleteIcon />
{title ? (
<h3 className={`${swatchesClass}--title`}>
<span>{title}</span>
{editable && (
<div className={`${swatchesClass}--actions`}>
<span role="button" className={`${baseClassName}__icon`} onClick={() => handleAddColor()}>
<AddIcon />
</span>
) : null}
</div>
)}
</h3>
{colors.length > 0 ? (
<span role="button" className={`${baseClassName}__icon`} onClick={() => handleRemoveColor()}>
<DeleteIcon />
</span>
) : null}
</div>
)}
</h3>
) : (
<></>
)}
<ul className={classnames(`${swatchesClass}--items`, 'narrow-scrollbar')}>
{colors.map((color) => (
<li
Expand Down