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.

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

fix(color-picker): fix hex alpha doesn't work #2628

Merged
merged 1 commit into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/color-picker/_example/color-mode.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { ColorPicker, Space } from 'tdesign-react';

export default function ColorMode() {
const color1 = '#0052d9';
const color1 = 'rgba(0, 82, 217, 1)';
const color2 = '#0052d9';
const color3 = 'linear-gradient(45deg, #4facfe 0%, #00f2fe 100%)';

Expand All @@ -14,7 +14,7 @@ export default function ColorMode() {
</div>
<div>
<h5 style={{ marginBottom: 10, fontWeight: 'normal' }}>仅单色模式</h5>
<ColorPicker defaultValue={color2} format="CSS" colorModes={['monochrome']} />
<ColorPicker defaultValue={color2} format="HEX" colorModes={['monochrome']} />
</div>
<div style={{ width: '100%' }}></div>
<div>
Expand Down
4 changes: 2 additions & 2 deletions src/color-picker/_example/enable-alpha.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React, { useState } from 'react';
import { ColorPickerPanel } from 'tdesign-react';

export default function EnableAlpha() {
const [value, setValue] = useState('#0052d9');
const [value, setValue] = useState('#0052D9CC');

const handleChange = (value) => {
setValue(value);
};

return <ColorPickerPanel enableAlpha value={value} format="RGBA" onChange={handleChange} />;
return <ColorPickerPanel enableAlpha value={value} format="HEX" onChange={handleChange} />;
}
2 changes: 1 addition & 1 deletion src/color-picker/_example/trigger.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import React from 'react';
import { ColorPicker } from 'tdesign-react';

export default function PanelExample() {
return <ColorPicker defaultValue={'#0052d9'} showPrimaryColorPreview={false} />;
return <ColorPicker defaultValue={'#0052d9'} showPrimaryColorPreview={false} format="HEX" />;
}
1 change: 0 additions & 1 deletion src/color-picker/components/panel/format/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export interface TdColorFormatProps extends TdColorPickerProps {
const FormatPanel = (props: TdColorFormatProps) => {
const { baseClassName, format, onModeChange, selectInputProps } = props;
const [formatMode, setFormatMode] = useState(format);

const handleModeChange = (v: TdColorPickerProps['format']) => {
setFormatMode(v);
onModeChange(v);
Expand Down
36 changes: 18 additions & 18 deletions src/color-picker/components/panel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,25 @@ const Panel = forwardRef<HTMLDivElement, ColorPickerProps>((props, ref) => {
closeBtn,
colorModes = ['linear-gradient', 'monochrome'],
showPrimaryColorPreview = true,
onRecentColorsChange,
} = props;
const [innerValue, setInnerValue] = useControlled(props, 'value', onChange);
const [mode, setMode] = useState<TdColorModes>(colorModes?.length === 1 ? colorModes[0] : 'monochrome');
const isGradient = mode === 'linear-gradient'; // 判断是否为gradient模式
const [updateId, setUpdateId] = useState(0);

const isGradient = mode === 'linear-gradient'; // 判断是否为 linear-gradient 模式
const defaultEmptyColor = isGradient ? DEFAULT_LINEAR_GRADIENT : DEFAULT_COLOR;

const [recentlyUsedColors, setRecentlyUsedColors] = useControlled(props, 'recentColors', onRecentColorsChange, {
defaultRecentColors: colorPickerDefaultProps.recentColors,
});

const colorInstanceRef = useRef<Color>(new Color(innerValue || defaultEmptyColor));
const getmodeByColor = colorInstanceRef.current.isGradient ? 'linear-gradient' : 'monochrome';
const [updateId, setUpdateId] = useState(0);
const getModeByColor = colorInstanceRef.current.isGradient ? 'linear-gradient' : 'monochrome';
const formatRef = useRef<TdColorPickerProps['format']>(colorInstanceRef.current.isGradient ? 'CSS' : format ?? 'RGB');

const update = useCallback(
(value) => {
(value: string) => {
colorInstanceRef.current.update(value);
setUpdateId(updateId + 1);
},
Expand All @@ -66,9 +74,9 @@ const Panel = forwardRef<HTMLDivElement, ColorPickerProps>((props, ref) => {
if (mode === 'linear-gradient') {
return colorInstanceRef.current.linearGradient;
}

return colorInstanceRef.current.getFormatsColorMap()[format] || colorInstanceRef.current.css;
}, [format, mode]);
const finalFormat = format === 'HEX' && enableAlpha ? 'HEX8' : format; // hex should transfer to hex8 when alpha channel is opened
return colorInstanceRef.current.getFormatsColorMap()[finalFormat] || colorInstanceRef.current.css;
}, [format, enableAlpha, mode]);

const emitColorChange = useCallback(
(trigger?: ColorPickerChangeTrigger) => {
Expand All @@ -84,7 +92,6 @@ const Panel = forwardRef<HTMLDivElement, ColorPickerProps>((props, ref) => {
if (typeof value === 'undefined' || mode === 'linear-gradient') {
return;
}

// common Color new 的时候使用 hsv ,一个 rgba 可以对应两个 hsv ,这里先直接用 tinycolor 比较下颜色是否修改了
const newUniqColor = tinyColor(value).toRgb();
const { r, g, b, a } = newUniqColor;
Expand All @@ -106,16 +113,9 @@ const Panel = forwardRef<HTMLDivElement, ColorPickerProps>((props, ref) => {
if (colorModes.length === 1) {
setMode(colorModes[0]);
} else {
setMode(getmodeByColor);
setMode(getModeByColor);
}
}, [colorModes, getmodeByColor]);

const formatRef = useRef<TdColorPickerProps['format']>(colorInstanceRef.current.isGradient ? 'CSS' : 'RGB');

const { onRecentColorsChange } = props;
const [recentlyUsedColors, setRecentlyUsedColors] = useControlled(props, 'recentColors', onRecentColorsChange, {
defaultRecentColors: colorPickerDefaultProps.recentColors,
});
}, [colorModes, getModeByColor]);

const baseProps = {
color: colorInstanceRef.current,
Expand Down Expand Up @@ -259,7 +259,7 @@ const Panel = forwardRef<HTMLDivElement, ColorPickerProps>((props, ref) => {
color.update(value);
color.updateCurrentGradientColor();
} else {
console.warn('该模式不支持渐变色');
console.warn('linear-gradient is not supported in this mode');
}
} else if (mode === 'linear-gradient') {
setMode('monochrome');
Expand Down
Loading
Loading